From ccb6e7f1f97be71dc1ac065d4ff859093feaaa66 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 11 Mar 2024 15:38:13 +0100 Subject: [PATCH 01/10] Fix minor issue in any-metric-receiver.md (#4111) --- content/en/blog/2023/any-metric-receiver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/blog/2023/any-metric-receiver.md b/content/en/blog/2023/any-metric-receiver.md index 6b35402a0e2a..659ccee4bc9a 100644 --- a/content/en/blog/2023/any-metric-receiver.md +++ b/content/en/blog/2023/any-metric-receiver.md @@ -53,7 +53,7 @@ HOST=${1} PORT=${2:-443} now=$(date +%s) -str=$(echo q | openssl s_client -servername "${HOST}" "${HOST}:${PORT}" 2>/dev/null | openssl x509 -noout -enddate | awk -F"=" '{ print $2; }') +notAfterString=$(echo q | openssl s_client -servername "${HOST}" "${HOST}:${PORT}" 2>/dev/null | openssl x509 -noout -enddate | awk -F"=" '{ print $2; }') if [[ "$(uname)" == "Darwin" ]] ; then notAfter=$(date -j -f "%b %d %H:%M:%S %Y %Z" "${notAfterString}" +%s) else From ae0a72b47b6ab37f70a4261a7d3577a1e87a6203 Mon Sep 17 00:00:00 2001 From: James Isnor Date: Mon, 11 Mar 2024 11:47:36 -0300 Subject: [PATCH 02/10] Remove invalid registry entry (#4118) --- ...mentation-go-thegeekyasian-go-chi-otel.yml | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 data/registry/instrumentation-go-thegeekyasian-go-chi-otel.yml diff --git a/data/registry/instrumentation-go-thegeekyasian-go-chi-otel.yml b/data/registry/instrumentation-go-thegeekyasian-go-chi-otel.yml deleted file mode 100644 index e98793b2bb18..000000000000 --- a/data/registry/instrumentation-go-thegeekyasian-go-chi-otel.yml +++ /dev/null @@ -1,20 +0,0 @@ -# cSpell:ignore go-chi-otel thegeekyasian -title: go-chi-otel --- Instrumentation for go-chi/chi -registryType: instrumentation -language: go -tags: - - go - - instrumentation - - go-chi - - go-chi-otel - - chi -license: Apache 2.0 -description: - Instrumentation for the Golang `go-chi/chi` package, enabling users to have - custom scope names. -authors: - - name: The Geeky Asian - email: msafeeransari@gmail.com -urls: - repo: https://github.com/thegeekyasian/go-chi-otel -createdAt: 2024-02-19 From 5c81d3972cea43fb24716f1d6b06c6e6551b313e Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Mon, 11 Mar 2024 11:11:01 -0400 Subject: [PATCH 03/10] [demo] Replace references to feature flag service with flagd (#4058) --- content/en/docs/demo/_index.md | 26 ++-- content/en/docs/demo/architecture.md | 15 --- content/en/docs/demo/development.md | 6 - content/en/docs/demo/docker-deployment.md | 1 - content/en/docs/demo/feature-flags.md | 18 ++- content/en/docs/demo/kubernetes-deployment.md | 1 - .../en/docs/demo/requirements/architecture.md | 12 +- content/en/docs/demo/services/_index.md | 33 +++-- content/en/docs/demo/services/feature-flag.md | 113 ------------------ .../en/docs/demo/telemetry-features/_index.md | 5 + .../demo/telemetry-features/log-coverage.md | 31 +++-- .../manual-span-attributes.md | 8 -- .../telemetry-features/metric-coverage.md | 31 +++-- .../demo/telemetry-features/trace-coverage.md | 31 +++-- .../docs/languages/erlang/getting-started.md | 4 - .../en/docs/languages/go/getting-started.md | 2 +- data/registry/instrumentation-elixir-ecto.yml | 1 - static/refcache.json | 12 ++ 18 files changed, 106 insertions(+), 244 deletions(-) delete mode 100644 content/en/docs/demo/services/feature-flag.md diff --git a/content/en/docs/demo/_index.md b/content/en/docs/demo/_index.md index c8ae6b40ccfe..cb35886fbb6d 100644 --- a/content/en/docs/demo/_index.md +++ b/content/en/docs/demo/_index.md @@ -23,19 +23,18 @@ Want to deploy the demo and see it in action? Start here. Want to understand how a particular language's instrumentation works? Start here. -| Language | Automatic Instrumentation | Instrumentation Libraries | Manual Instrumentation | -| ------------- | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | -| .NET | | [Cart Service](services/cart/) | [Cart Service](services/cart/) | -| C++ | | | [Currency Service](services/currency/) | -| Erlang/Elixir | | [Feature Flag Service](services/feature-flag/) | [Feature Flag Service](services/feature-flag/) | -| Go | | [Accounting Service](services/accounting/), [Checkout Service](services/checkout/), [Product Catalog Service](services/product-catalog/) | [Checkout Service](services/checkout/), [Product Catalog Service](services/product-catalog/) | -| Java | [Ad Service](services/ad/) | | [Ad Service](services/ad/) | -| JavaScript | | [Frontend](services/frontend/) | [Frontend](services/frontend/), [Payment Service](services/payment/) | -| Kotlin | | [Fraud Detection Service](services/fraud-detection/) | | -| PHP | | [Quote Service](services/quote/) | [Quote Service](services/quote/) | -| Python | [Recommendation Service](services/recommendation/) | | [Recommendation Service](services/recommendation/) | -| Ruby | | [Email Service](services/email/) | [Email Service](services/email/) | -| Rust | | [Shipping Service](services/shipping/) | [Shipping Service](services/shipping/) | +| Language | Automatic Instrumentation | Instrumentation Libraries | Manual Instrumentation | +| ---------- | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | +| .NET | | [Cart Service](services/cart/) | [Cart Service](services/cart/) | +| C++ | | | [Currency Service](services/currency/) | +| Go | | [Accounting Service](services/accounting/), [Checkout Service](services/checkout/), [Product Catalog Service](services/product-catalog/) | [Checkout Service](services/checkout/), [Product Catalog Service](services/product-catalog/) | +| Java | [Ad Service](services/ad/) | | [Ad Service](services/ad/) | +| JavaScript | | [Frontend](services/frontend/) | [Frontend](services/frontend/), [Payment Service](services/payment/) | +| Kotlin | | [Fraud Detection Service](services/fraud-detection/) | | +| PHP | | [Quote Service](services/quote/) | [Quote Service](services/quote/) | +| Python | [Recommendation Service](services/recommendation/) | | [Recommendation Service](services/recommendation/) | +| Ruby | | [Email Service](services/email/) | [Email Service](services/email/) | +| Rust | | [Shipping Service](services/shipping/) | [Shipping Service](services/shipping/) | ## Service Documentation @@ -46,7 +45,6 @@ found here: - [Cart Service](services/cart/) - [Checkout Service](services/checkout/) - [Email Service](services/email/) -- [Feature Flag Service](services/feature-flag/) - [Frontend](services/frontend/) - [Load Generator](services/load-generator/) - [Payment Service](services/payment/) diff --git a/content/en/docs/demo/architecture.md b/content/en/docs/demo/architecture.md index d97b4892ef14..2f679cbd48dc 100644 --- a/content/en/docs/demo/architecture.md +++ b/content/en/docs/demo/architecture.md @@ -28,19 +28,14 @@ productcatalogservice(Product Catalog Service):::golang quoteservice(Quote Service):::php recommendationservice(Recommendation Service):::python shippingservice(Shipping Service):::rust -featureflagservice(Feature Flag Service):::erlang -featureflagstore[(Feature Flag Store
(PostgreSQL DB))] queue[(queue
(Kafka))] Internet -->|HTTP| frontendproxy frontendproxy -->|HTTP| frontend -frontendproxy -->|HTTP| featureflagservice loadgenerator -->|HTTP| frontendproxy accountingservice -->|TCP| queue -cartservice --->|gRPC| featureflagservice - checkoutservice --->|gRPC| cartservice --> cache checkoutservice --->|gRPC| productcatalogservice checkoutservice --->|gRPC| currencyservice @@ -59,16 +54,6 @@ frontend -->|gRPC| shippingservice -->|HTTP| quoteservice frauddetectionservice -->|TCP| queue -adservice --->|gRPC| featureflagservice - -productcatalogservice -->|gRPC| featureflagservice - -recommendationservice -->|gRPC| featureflagservice - -shippingservice -->|gRPC| featureflagservice - -featureflagservice --> featureflagstore - end classDef dotnet fill:#178600,color:white; diff --git a/content/en/docs/demo/development.md b/content/en/docs/demo/development.md index a9e1524e25cb..34a3045eeb0c 100644 --- a/content/en/docs/demo/development.md +++ b/content/en/docs/demo/development.md @@ -33,12 +33,6 @@ receive hints from IDEs such as IntelliJ or VS Code. It may be necessary to run - pkg-config - protobuf-compiler -### Elixir - -- Erlang/OTP 23+ -- Elixir 1.13+ -- Rebar3 3.20+ - ### Go - Go 1.19+ diff --git a/content/en/docs/demo/docker-deployment.md b/content/en/docs/demo/docker-deployment.md index dcd51ee95f33..e551a2f1ae03 100644 --- a/content/en/docs/demo/docker-deployment.md +++ b/content/en/docs/demo/docker-deployment.md @@ -67,7 +67,6 @@ Once the images are built and containers are started you can access: - Web store: - Grafana: -- Feature Flags UI: - Load Generator UI: - Jaeger UI: - Tracetest UI: , only when using `make start-odd` diff --git a/content/en/docs/demo/feature-flags.md b/content/en/docs/demo/feature-flags.md index eeca0b01bc74..bc2202648117 100644 --- a/content/en/docs/demo/feature-flags.md +++ b/content/en/docs/demo/feature-flags.md @@ -1,13 +1,14 @@ --- title: Feature Flags aliases: [feature_flags] -cSpell:ignore: OLJCESPC7Z +cSpell:ignore: flagd OLJCESPC7Z --- -This demo comes with several feature flags which can control failure conditions -in specific services. By default the flags are disabled. Using the Feature Flags -UI you will be able to control the status of -these feature flags. +The demo provides several feature flags that you can use to simulate different +scenarios. These flags are managed by [`flagd`](https://flagd.dev), a simple +feature flag service that supports [OpenFeature](https://openfeature.dev). Flag +values are stored in the `demo.flagd.json` file. To enable a flag, change the +`defaultVariant` value in the config file for a given flag to "on". | Feature Flag | Service(s) | Description | | ----------------------- | --------------- | -------------------------------------------------------------------------------------------------------- | @@ -15,3 +16,10 @@ these feature flags. | `cartServiceFailure` | Cart Service | Generate an error for `EmptyCart` 1/10th of the time | | `productCatalogFailure` | Product Catalog | Generate an error for `GetProduct` requests with product id: `OLJCESPC7Z` | | `recommendationCache` | Recommendation | Create a memory leak due to an exponentially growing cache. 1.4x growth, 50% of requests trigger growth. | + +## Feature Flag Architecture + +Please see the [flagd documentation](https://flagd.dev) for more information on +how flagd works, and the [OpenFeature](https://openfeature.dev) website for more +information on how OpenFeature works, along with documentation for the +OpenFeature API. diff --git a/content/en/docs/demo/kubernetes-deployment.md b/content/en/docs/demo/kubernetes-deployment.md index c6064f18c4c7..79207c5fc2d5 100644 --- a/content/en/docs/demo/kubernetes-deployment.md +++ b/content/en/docs/demo/kubernetes-deployment.md @@ -73,7 +73,6 @@ With the frontendproxy port-forward set up, you can access: - Web store: - Grafana: -- Feature Flags UI: - Load Generator UI: - Jaeger UI: diff --git a/content/en/docs/demo/requirements/architecture.md b/content/en/docs/demo/requirements/architecture.md index ea13ba700e8d..e2b8400d6e4e 100644 --- a/content/en/docs/demo/requirements/architecture.md +++ b/content/en/docs/demo/requirements/architecture.md @@ -68,16 +68,8 @@ application written in Swift. ## Feature Flag Component -This component should consist of one (or more) services that provides a simple -feature flag configuration utility for the main application. It is made up of a -browser-based client/admin interface and a backend service or services. The role -of the client is to allow an operator to visualize the available feature flags -and toggle their state. The server should provide a catalog of feature flags -that main application services can register with and interrogate for their -current status and targeting rules. - -The feature flag component should be implemented as an Erlang+Elixir/Phoenix -service. The catalog of feature flags should be stored in a Database. +Feature flagging is a crucial part of cloud native application development. The +demo uses OpenFeature, a CNCF incubating project, to manage feature flags. ## Orchestration and Deployment diff --git a/content/en/docs/demo/services/_index.md b/content/en/docs/demo/services/_index.md index a5fb164022c7..ce9f0392d942 100644 --- a/content/en/docs/demo/services/_index.md +++ b/content/en/docs/demo/services/_index.md @@ -6,20 +6,19 @@ cSpell:ignore: loadgenerator To visualize request flows, see the [Service Diagram](../architecture/). -| Service | Language | Description | -| ----------------------------------------- | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| [accountingservice](accounting/) | Go | Processes incoming orders and count the sum of all orders (mock/). | -| [adservice](ad/) | Java | Provides text ads based on given context words. | -| [cartservice](cart/) | .NET | Stores the items in the user's shopping cart in Redis and retrieves it. | -| [checkoutservice](checkout/) | Go | Retrieves user cart, prepares order and orchestrates the payment, shipping and the email notification. | -| [currencyservice](currency/) | C++ | Converts one money amount to another currency. Uses real values fetched from European Central Bank. It's the highest QPS service. | -| [emailservice](email/) | Ruby | Sends users an order confirmation email (mock/). | -| [frauddetectionservice](fraud-detection/) | Kotlin | Analyzes incoming orders and detects fraud attempts (mock/). | -| [featureflagservice](feature-flag/) | Erlang/Elixir | CRUD feature flag service to demonstrate various scenarios like fault injection & how to emit telemetry from a feature flag reliant service. | -| [frontend](frontend/) | JavaScript | Exposes an HTTP server to serve the website. Does not require sign up / login and generates session IDs for all users automatically. | -| [loadgenerator](load-generator/) | Python/Locust | Continuously sends requests imitating realistic user shopping flows to the frontend. | -| [paymentservice](payment/) | JavaScript | Charges the given credit card info (mock/) with the given amount and returns a transaction ID. | -| [productcatalogservice](product-catalog/) | Go | Provides the list of products from a JSON file and ability to search products and get individual products. | -| [quoteservice](quote/) | PHP | Calculates the shipping costs, based on the number of items to be shipped. | -| [recommendationservice](recommendation/) | Python | Recommends other products based on what's given in the cart. | -| [shippingservice](shipping/) | Rust | Gives shipping cost estimates based on the shopping cart. Ships items to the given address (mock/). | +| Service | Language | Description | +| ----------------------------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------ | +| [accountingservice](accounting/) | Go | Processes incoming orders and count the sum of all orders (mock/). | +| [adservice](ad/) | Java | Provides text ads based on given context words. | +| [cartservice](cart/) | .NET | Stores the items in the user's shopping cart in Redis and retrieves it. | +| [checkoutservice](checkout/) | Go | Retrieves user cart, prepares order and orchestrates the payment, shipping and the email notification. | +| [currencyservice](currency/) | C++ | Converts one money amount to another currency. Uses real values fetched from European Central Bank. It's the highest QPS service. | +| [emailservice](email/) | Ruby | Sends users an order confirmation email (mock/). | +| [frauddetectionservice](fraud-detection/) | Kotlin | Analyzes incoming orders and detects fraud attempts (mock/). | +| [frontend](frontend/) | JavaScript | Exposes an HTTP server to serve the website. Does not require sign up / login and generates session IDs for all users automatically. | +| [loadgenerator](load-generator/) | Python/Locust | Continuously sends requests imitating realistic user shopping flows to the frontend. | +| [paymentservice](payment/) | JavaScript | Charges the given credit card info (mock/) with the given amount and returns a transaction ID. | +| [productcatalogservice](product-catalog/) | Go | Provides the list of products from a JSON file and ability to search products and get individual products. | +| [quoteservice](quote/) | PHP | Calculates the shipping costs, based on the number of items to be shipped. | +| [recommendationservice](recommendation/) | Python | Recommends other products based on what's given in the cart. | +| [shippingservice](shipping/) | Rust | Gives shipping cost estimates based on the shopping cart. Ships items to the given address (mock/). | diff --git a/content/en/docs/demo/services/feature-flag.md b/content/en/docs/demo/services/feature-flag.md deleted file mode 100644 index b39bbd900b53..000000000000 --- a/content/en/docs/demo/services/feature-flag.md +++ /dev/null @@ -1,113 +0,0 @@ ---- -title: Feature Flag Service -linkTitle: Feature Flag -aliases: [featureflagservice] -cSpell:ignore: ecto featureflag grpcbox nanos oteldemo protos struct ---- - -This service is written in Erlang/Elixir and it is responsible for creating, -reading, updating and deleting feature flags in a PostgreSQL DB. It is called by -Product Catalog and Shipping services. - -[Feature Flag Service Source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/featureflagservice/) - -## Traces - -### Initializing Tracing - -In order to set up OpenTelemetry instrumentation for -[Phoenix](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix/), -and -[Ecto](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_ecto/), -we need to call the setup methods of their instrumentation packages before -starting the Supervisor. - -This is done in the `application.ex` as follows: - -```elixir -@impl true - def start(_type, _args) do - OpentelemetryEcto.setup([:featureflagservice, :repo]) - OpentelemetryPhoenix.setup() - - children = [ - # Start the Ecto repository - Featureflagservice.Repo, - # Start the PubSub system - {Phoenix.PubSub, name: Featureflagservice.PubSub}, - # Start the Endpoint (http/https) - FeatureflagserviceWeb.Endpoint - # Start a worker by calling: Featureflagservice.Worker.start_link(arg) - # {Featureflagservice.Worker, arg} - ] - - # See https://hexdocs.pm/elixir/Supervisor.html - # for other strategies and supported options - opts = [strategy: :one_for_one, name: Featureflagservice.Supervisor] - Supervisor.start_link(children, opts) - end -``` - -To add tracing to [grpcbox](https://github.com/tsloughter/grpcbox), we need to -add the appropriate -[interceptor](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_grpcbox). - -This is configured in the `runtime.exs` file, as follows: - -```elixir -config :grpcbox, - servers: [ - %{ - :grpc_opts => %{ - :service_protos => [:ffs_demo_pb], - :unary_interceptor => {:otel_grpcbox_interceptor, :unary}, - :services => %{:"oteldemo.FeatureFlagService" => :ffs_service} - }, - :listen_opts => %{:port => grpc_port} - } - ] -``` - -### Add attributes to auto-instrumented spans - -Adding attributes to a span is accomplished by using `?set_attribute` on the -span object. In the `get_flag` function two attributes are added to the span. - -```elixir --include_lib("grpcbox/include/grpcbox.hrl"). - --include_lib("opentelemetry_api/include/otel_tracer.hrl"). - --spec get_flag(ctx:t(), ffs_demo_pb:get_flag_request()) -> - {ok, ffs_demo_pb:get_flag_response(), ctx:t()} | grpcbox_stream:grpc_error_response(). -get_flag(Ctx, #{name := Name}) -> - case 'Elixir.Featureflagservice.FeatureFlags':get_feature_flag_by_name(Name) of - nil -> - {grpc_error, {?GRPC_STATUS_NOT_FOUND, <<"the requested feature flag does not exist">>}}; - #{'__struct__' := 'Elixir.Featureflagservice.FeatureFlags.FeatureFlag', - description := Description, - enabled := Enabled, - inserted_at := CreatedAt, - updated_at := UpdatedAt - } -> - ?set_attribute('app.featureflag.name', Name), - ?set_attribute('app.featureflag.enabled', Enabled), - {ok, Epoch} = 'Elixir.NaiveDateTime':from_erl({{1970, 1, 1}, {0, 0, 0}}), - CreatedAtSeconds = 'Elixir.NaiveDateTime':diff(CreatedAt, Epoch), - UpdatedAtSeconds = 'Elixir.NaiveDateTime':diff(UpdatedAt, Epoch), - Flag = #{name => Name, - description => Description, - enabled => Enabled, - created_at => #{seconds => CreatedAtSeconds, nanos => 0}, - updated_at => #{seconds => UpdatedAtSeconds, nanos => 0}}, - {ok, #{flag => Flag}, Ctx} - end. -``` - -## Metrics - -TBD - -## Logs - -TBD diff --git a/content/en/docs/demo/telemetry-features/_index.md b/content/en/docs/demo/telemetry-features/_index.md index ef1571fc9b6a..6f95e568645c 100644 --- a/content/en/docs/demo/telemetry-features/_index.md +++ b/content/en/docs/demo/telemetry-features/_index.md @@ -2,6 +2,7 @@ title: Telemetry Features linkTitle: Telemetry Features aliases: [demo_features, features] +cSpell:ignore: flagd --- ## OpenTelemetry @@ -51,3 +52,7 @@ aliases: [demo_features, features] flag service. - **[Locust](https://locust.io)**: a background job that creates realistic usage patterns on the website using a synthetic load generator. +- **[OpenFeature](https://openfeature.dev)**: a feature flagging API and SDK + that allows for the enabling and disabling of features in the application. +- **[flagd](https://flagd.dev)**: a feature flagging daemon that is used to + manage feature flags in the demo application. diff --git a/content/en/docs/demo/telemetry-features/log-coverage.md b/content/en/docs/demo/telemetry-features/log-coverage.md index 4d31bd2a12d1..986dc4bdcc54 100644 --- a/content/en/docs/demo/telemetry-features/log-coverage.md +++ b/content/en/docs/demo/telemetry-features/log-coverage.md @@ -4,22 +4,21 @@ linkTitle: Log Coverage aliases: [log_service_features, logging-features, ../logging-features] --- -| Service | Language | OTLP Logs | -| --------------- | --------------- | --------- | -| Accounting | Go | 🚧 | -| Ad | Java | ✅ | -| Cart | .NET | ✅ | -| Checkout | Go | 🚧 | -| Currency | C++ | 🚧 | -| Email | Ruby | 🚧 | -| Feature Flag | Erlang / Elixir | 🚧 | -| Fraud Detection | Kotlin | ✅ | -| Frontend | TypeScript | 🚧 | -| Payment | JavaScript | 🚧 | -| Product Catalog | Go | 🚧 | -| Quote | PHP | ✅ | -| Recommendation | Python | ✅ | -| Shipping | Rust | 🚧 | +| Service | Language | OTLP Logs | +| --------------- | ---------- | --------- | +| Accounting | Go | 🚧 | +| Ad | Java | ✅ | +| Cart | .NET | ✅ | +| Checkout | Go | 🚧 | +| Currency | C++ | 🚧 | +| Email | Ruby | 🚧 | +| Fraud Detection | Kotlin | ✅ | +| Frontend | TypeScript | 🚧 | +| Payment | JavaScript | 🚧 | +| Product Catalog | Go | 🚧 | +| Quote | PHP | ✅ | +| Recommendation | Python | ✅ | +| Shipping | Rust | 🚧 | Emoji Legend: diff --git a/content/en/docs/demo/telemetry-features/manual-span-attributes.md b/content/en/docs/demo/telemetry-features/manual-span-attributes.md index 170d28257158..a8a37eaa616e 100644 --- a/content/en/docs/demo/telemetry-features/manual-span-attributes.md +++ b/content/en/docs/demo/telemetry-features/manual-span-attributes.md @@ -54,14 +54,6 @@ This page lists the manual Span Attributes used throughout the demo: | `app.email.recipient` | string | Email used for order confirmation | | `app.order.id` | string | Order ID | -## FeatureFlagService - -| Name | Type | Description | -| ----------------------------- | ------- | ------------------------ | -| `app.featureflag.name` | string | Name of the feature flag | -| `app.featureflag.description` | string | Admin description | -| `app.featureflag.enabled` | boolean | The feature flag status | - ## Frontend | Name | Type | Description | diff --git a/content/en/docs/demo/telemetry-features/metric-coverage.md b/content/en/docs/demo/telemetry-features/metric-coverage.md index 67d6d1d662b6..539c2c371786 100644 --- a/content/en/docs/demo/telemetry-features/metric-coverage.md +++ b/content/en/docs/demo/telemetry-features/metric-coverage.md @@ -4,22 +4,21 @@ linkTitle: Metric Coverage aliases: [metric_service_features, metric-features, ../metric-features] --- -| Service | Language | Instrumentation Libraries | Manual Instrumentation | Multiple Instruments | Views | Custom Attributes | Resource Detection | Exemplars | -| --------------- | --------------- | ------------------------- | ---------------------- | -------------------- | ----- | ----------------- | ------------------ | --------- | -| Accounting | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Ad | Java | ✅ | ✅ | 🚧 | 🚧 | ✅ | ✅ | ✅ | -| Cart | .NET | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Checkout | Go | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Currency | C++ | 🔕 | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Email | Ruby | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Feature Flag | Erlang / Elixir | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | ✅ | 🚧 | -| Frontend | TypeScript | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Payment | JavaScript | 🚧 | ✅ | 🚧 | 🚧 | 🚧 | ✅ | 🚧 | -| Product Catalog | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Quote | PHP | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Recommendation | Python | ✅ | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Shipping | Rust | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Service | Language | Instrumentation Libraries | Manual Instrumentation | Multiple Instruments | Views | Custom Attributes | Resource Detection | Exemplars | +| --------------- | ---------- | ------------------------- | ---------------------- | -------------------- | ----- | ----------------- | ------------------ | --------- | +| Accounting | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Ad | Java | ✅ | ✅ | 🚧 | 🚧 | ✅ | ✅ | ✅ | +| Cart | .NET | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Checkout | Go | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Currency | C++ | 🔕 | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Email | Ruby | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | ✅ | 🚧 | +| Frontend | TypeScript | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Payment | JavaScript | 🚧 | ✅ | 🚧 | 🚧 | 🚧 | ✅ | 🚧 | +| Product Catalog | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Quote | PHP | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Recommendation | Python | ✅ | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Shipping | Rust | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | Emoji Legend: diff --git a/content/en/docs/demo/telemetry-features/trace-coverage.md b/content/en/docs/demo/telemetry-features/trace-coverage.md index 2b3dcc6a6151..4fcf56e1b1eb 100644 --- a/content/en/docs/demo/telemetry-features/trace-coverage.md +++ b/content/en/docs/demo/telemetry-features/trace-coverage.md @@ -4,22 +4,21 @@ linkTitle: Trace Coverage aliases: [trace_service_features, trace-features, ../trace-features] --- -| Service | Language | Instrumentation Libraries | Manual Span Creation | Span Data Enrichment | RPC Context Propagation | Span Links | Baggage | Resource Detection | -| ------------------ | --------------- | ------------------------- | -------------------- | -------------------- | ----------------------- | ---------- | ------- | ------------------ | -| Accounting Service | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | ✅ | -| Ad | Java | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Cart | .NET | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | ✅ | -| Checkout | Go | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | ✅ | -| Currency | C++ | 🔕 | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🚧 | -| Email | Ruby | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Feature Flag | Erlang / Elixir | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | -| Frontend | JavaScript | ✅ | ✅ | ✅ | 🔕 | ✅ | ✅ | ✅ | -| Payment | JavaScript | ✅ | ✅ | ✅ | 🔕 | 🔕 | ✅ | ✅ | -| Product Catalog | Go | ✅ | 🔕 | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Quote Service | PHP | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Recommendation | Python | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Shipping | Rust | 🔕 | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🚧 | +| Service | Language | Instrumentation Libraries | Manual Span Creation | Span Data Enrichment | RPC Context Propagation | Span Links | Baggage | Resource Detection | +| ------------------ | ---------- | ------------------------- | -------------------- | -------------------- | ----------------------- | ---------- | ------- | ------------------ | +| Accounting Service | Go | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | ✅ | +| Ad | Java | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | +| Cart | .NET | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | ✅ | +| Checkout | Go | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | ✅ | +| Currency | C++ | 🔕 | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🚧 | +| Email | Ruby | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | +| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Frontend | JavaScript | ✅ | ✅ | ✅ | 🔕 | ✅ | ✅ | ✅ | +| Payment | JavaScript | ✅ | ✅ | ✅ | 🔕 | 🔕 | ✅ | ✅ | +| Product Catalog | Go | ✅ | 🔕 | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | +| Quote Service | PHP | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | +| Recommendation | Python | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | +| Shipping | Rust | 🔕 | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🚧 | Emoji Legend: diff --git a/content/en/docs/languages/erlang/getting-started.md b/content/en/docs/languages/erlang/getting-started.md index a74a0e355b41..85b40f720b6a 100644 --- a/content/en/docs/languages/erlang/getting-started.md +++ b/content/en/docs/languages/erlang/getting-started.md @@ -574,7 +574,3 @@ Enrich your instrumentation with more You'll also want to configure an appropriate exporter to [export your telemetry data](/docs/languages/erlang/exporters) to one or more telemetry backends. - -If you'd like to explore a more complex example, take a look at the -[OpenTelemetry Demo](/docs/demo/), which includes the Erlang/Elixir based -[Feature Flag Service](/docs/demo/services/feature-flag/). diff --git a/content/en/docs/languages/go/getting-started.md b/content/en/docs/languages/go/getting-started.md index 592fc0cb0893..768eb94403ad 100644 --- a/content/en/docs/languages/go/getting-started.md +++ b/content/en/docs/languages/go/getting-started.md @@ -1035,7 +1035,7 @@ telemetry backends. If you'd like to explore a more complex example, take a look at the [OpenTelemetry Demo](/docs/demo/), which includes the Go based -[Checkout Service](/docs/demo/services/feature-flag/), +[Checkout Service](/docs/demo/services/checkout/), [Product Catalog Service](/docs/demo/services/product-catalog/), and [Accounting Service](/docs/demo/services/accounting/) diff --git a/data/registry/instrumentation-elixir-ecto.yml b/data/registry/instrumentation-elixir-ecto.yml index caa059f576bc..05fcf7d8bcbb 100644 --- a/data/registry/instrumentation-elixir-ecto.yml +++ b/data/registry/instrumentation-elixir-ecto.yml @@ -13,7 +13,6 @@ authors: - name: OpenTelemetry Authors urls: repo: https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_ecto - demo: /docs/demo/services/feature-flag/ createdAt: 2022-03-23 package: registry: hex diff --git a/static/refcache.json b/static/refcache.json index 28ee56952be7..c6643b36e81e 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -1915,6 +1915,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T05:18:24.637098-05:00" }, + "https://flagd.dev": { + "StatusCode": 206, + "LastSeen": "2024-03-07T10:30:35.468496-05:00" + }, "https://flagd.dev/reference/monitoring/#opentelemetry": { "StatusCode": 206, "LastSeen": "2024-01-30T16:06:38.046811-05:00" @@ -2727,6 +2731,10 @@ "StatusCode": 200, "LastSeen": "2024-01-18T20:06:18.89171-05:00" }, + "https://github.com/open-feature/flagd": { + "StatusCode": 200, + "LastSeen": "2024-02-27T10:05:21.050757-05:00" + }, "https://github.com/open-telemetry": { "StatusCode": 200, "LastSeen": "2024-01-18T19:10:19.568632-05:00" @@ -5351,6 +5359,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:03:38.301664-05:00" }, + "https://openfeature.dev": { + "StatusCode": 206, + "LastSeen": "2024-02-27T10:05:20.149319-05:00" + }, "https://openfeature.dev/": { "StatusCode": 206, "LastSeen": "2024-01-30T16:06:32.46557-05:00" From dee10fae82d2c8aa1911acbd4270412a8a4222f3 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 11 Mar 2024 16:29:54 +0100 Subject: [PATCH 04/10] Add download instructions to ocb docs (#4078) --- content/en/docs/collector/custom-collector.md | 81 ++++++++++++++----- data/registry/collector-builder.yml | 5 ++ data/registry/collector-exporter-debug.yml | 4 + data/registry/collector-exporter-otlp.yml | 4 + data/registry/collector-processor-batch.yml | 4 + data/registry/collector-receiver-otlp.yml | 4 + .../partials/ecosystem/registry/entry.html | 2 + layouts/shortcodes/version-from-registry.md | 7 +- static/refcache.json | 24 ++++++ 9 files changed, 114 insertions(+), 21 deletions(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 11a13aab2c4f..80c84d81f651 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -20,29 +20,67 @@ builder][ocb] (or `ocb` for short) to assist people in assembling their own distribution, making it easy to build a distribution that includes their custom components along with components that are publicly available. -As part of the process the `builder` will generate the Collector's source code, +As part of the process the `ocb` will generate the Collector's source code, which you can use to help build and debug your own custom components, so let's get started. ## Step 1 - Install the builder The `ocb` binary is available as a downloadable asset from [OpenTelemetry -Collector releases][releases]. You will find the list of assets at the bottom of -the page. Assets are named based on OS and chipset, so download the one that -fits your configuration. +Collector releases][releases]. You will find a list of assets named based on OS +and chipset, so download the one that fits your configuration: -The binary has a pretty long name, so you can simply rename it to `ocb`; and if -you are running Linux or macOS, you will also need to provide execution -permissions for the binary. +{{< tabpane text=true >}} -Open your terminal and type the following commands to accomplish both -operations: +{{% tab "Linux (AMD 64)" %}} -```cmd -mv ocb_{{% param vers %}}_darwin_amd64 ocb -chmod 777 ocb +```sh +curl --proto '=https' --tlsv1.2 -fL -o ocb \ +https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_linux_amd64 +chmod +x ocb +``` + +{{% /tab %}} {{% tab "Linux (ARM 64)" %}} + +```sh +curl --proto '=https' --tlsv1.2 -fL -o ocb \ +https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_linux_arm64 +chmod +x ocb +``` + +{{% /tab %}} {{% tab "Linux (ppc64le) "%}} + +```sh +curl --proto '=https' --tlsv1.2 -fL -o ocb \ +https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_linux_ppc64le +chmod +x ocb +``` + +{{% /tab %}} {{% tab "MacOS (AMD 64)" %}} + +```sh +curl --proto '=https' --tlsv1.2 -fL -o ocb \ +https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_darwin_amd64 +chmod +x ocb ``` +{{% /tab %}} {{% tab "MacOS (ARM 64)" %}} + +```sh +curl --proto '=https' --tlsv1.2 -fL -o ocb \ +https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_darwin_arm64 +chmod +x ocb +``` + +{{% /tab %}} {{% tab "Windows (AMD 64)" %}} + +```sh +Invoke-WebRequest -Uri "https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2F{{% version-from-registry collector-builder %}}/ocb_{{% version-from-registry collector-builder noPrefix %}}_windows_amd64.exe" -OutFile "ocb.exe" +Unblock-File -Path "ocb.exe" +``` + +{{% /tab %}} {{< /tabpane >}} + To make sure the `ocb` is ready to be used, go to your terminal and type `./ocb help`, and once you hit enter you should have the output of the `help` command showing up in your console. @@ -64,7 +102,7 @@ Here are the tags for the `dist` map: | module: | The module name for the new distribution, following Go mod conventions. Optional, but recommended. | Yes | `go.opentelemetry.io/collector/cmd/builder` | | name: | The binary name for your distribution | Yes | `otelcol-custom` | | description: | A long name for the application. | Yes | `Custom OpenTelemetry Collector distribution` | -| otelcol_version: | The OpenTelemetry Collector version to use as base for the distribution. | Yes | `{{% param vers %}}` | +| otelcol_version: | The OpenTelemetry Collector version to use as base for the distribution. | Yes | `{{% version-from-registry collector-builder noPrefix %}}` | | output_path: | The path to write the output (sources and binary). | Yes | `/var/folders/86/s7l1czb16g124tng0d7wyrtw0000gn/T/otelcol-distribution3618633831` | | version: | The version for your custom OpenTelemetry Collector. | Yes | `1.0.0` | | go: | Which Go binary to use to compile the generated sources. | Yes | go from the PATH | @@ -113,22 +151,22 @@ dist: name: otelcol-dev description: Basic OTel Collector distribution for Developers output_path: ./otelcol-dev - otelcol_version: {{% param vers %}} + otelcol_version: {{% version-from-registry collector-builder noPrefix %}} exporters: - gomod: # NOTE: Prior to v0.86.0 use the `loggingexporter` instead of `debugexporter`. - go.opentelemetry.io/collector/exporter/debugexporter v{{% param vers %}} + go.opentelemetry.io/collector/exporter/debugexporter {{% version-from-registry collector-exporter-debug %}} - gomod: - go.opentelemetry.io/collector/exporter/otlpexporter v{{% param vers %}} + go.opentelemetry.io/collector/exporter/otlpexporter {{% version-from-registry collector-exporter-otlp %}} processors: - gomod: - go.opentelemetry.io/collector/processor/batchprocessor v{{% param vers %}} + go.opentelemetry.io/collector/processor/batchprocessor {{% version-from-registry collector-processor-batch %}} receivers: - gomod: - go.opentelemetry.io/collector/receiver/otlpreceiver v{{% param vers %}} + go.opentelemetry.io/collector/receiver/otlpreceiver {{% version-from-registry collector-receiver-otlp %}} ``` ## Step 3 - Generating the Code and Building your Collector's distribution @@ -144,7 +182,7 @@ If everything went well, here is what the output of the command should look like: ```nocode -2022-06-13T14:25:03.037-0500 INFO internal/command.go:85 OpenTelemetry Collector distribution builder {"version": "{{% param vers %}}", "date": "2023-01-03T15:05:37Z"} +2022-06-13T14:25:03.037-0500 INFO internal/command.go:85 OpenTelemetry Collector distribution builder {"version": "{{% version-from-registry collector-builder noPrefix %}}", "date": "2023-01-03T15:05:37Z"} 2022-06-13T14:25:03.039-0500 INFO internal/command.go:108 Using config file {"path": "builder-config.yaml"} 2022-06-13T14:25:03.040-0500 INFO builder/config.go:99 Using go {"go-executable": "/usr/local/go/bin/go"} 2022-06-13T14:25:03.041-0500 INFO builder/main.go:76 Sources created {"path": "./otelcol-dev"} @@ -185,6 +223,9 @@ Further reading: [ocb]: https://github.com/open-telemetry/opentelemetry-collector/tree/main/cmd/builder -[releases]: https://github.com/open-telemetry/opentelemetry-collector/releases +[releases]: + https://github.com/open-telemetry/opentelemetry-collector/releases/tag/cmd%2Fbuilder%2F{{% + +version-from-registry collector-builder %}} [^1]: Prior to v0.86.0 use the `loggingexporter` instead of `debugexporter`. diff --git a/data/registry/collector-builder.yml b/data/registry/collector-builder.yml index 7a91f770b204..318563ac6386 100644 --- a/data/registry/collector-builder.yml +++ b/data/registry/collector-builder.yml @@ -14,3 +14,8 @@ urls: repo: https://github.com/open-telemetry/opentelemetry-collector/tree/main/cmd/builder docs: /docs/collector/custom-collector/ createdAt: 2023-12-18 +package: + registry: go + name: go.opentelemetry.io/collector/cmd/builder + version: v0.95.0 + quickInstall: false diff --git a/data/registry/collector-exporter-debug.yml b/data/registry/collector-exporter-debug.yml index a8d6bfac5ae2..89908664c857 100644 --- a/data/registry/collector-exporter-debug.yml +++ b/data/registry/collector-exporter-debug.yml @@ -13,3 +13,7 @@ authors: urls: repo: https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter createdAt: 2020-11-05 +package: + registry: go-collector + name: go.opentelemetry.io/collector/exporter/debugexporter + version: v0.95.0 diff --git a/data/registry/collector-exporter-otlp.yml b/data/registry/collector-exporter-otlp.yml index f76e7a43f2b7..87d6b4330945 100644 --- a/data/registry/collector-exporter-otlp.yml +++ b/data/registry/collector-exporter-otlp.yml @@ -13,3 +13,7 @@ authors: urls: repo: https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter createdAt: 2020-11-05 +package: + registry: go-collector + name: go.opentelemetry.io/collector/exporter/otlpexporter + version: v0.95.0 diff --git a/data/registry/collector-processor-batch.yml b/data/registry/collector-processor-batch.yml index bf44f449b6f9..7ea1fd579eae 100644 --- a/data/registry/collector-processor-batch.yml +++ b/data/registry/collector-processor-batch.yml @@ -15,3 +15,7 @@ authors: urls: repo: https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor createdAt: 2021-02-24 +package: + registry: go-collector + name: go.opentelemetry.io/collector/processor/batchprocessor + version: v0.95.0 diff --git a/data/registry/collector-receiver-otlp.yml b/data/registry/collector-receiver-otlp.yml index bbe8e3f03cdc..75ca6c9559d0 100644 --- a/data/registry/collector-receiver-otlp.yml +++ b/data/registry/collector-receiver-otlp.yml @@ -13,3 +13,7 @@ authors: urls: repo: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver createdAt: 2020-11-05 +package: + registry: go-collector + name: go.opentelemetry.io/collector/receiver/otlpreceiver + version: v0.95.0 diff --git a/layouts/partials/ecosystem/registry/entry.html b/layouts/partials/ecosystem/registry/entry.html index 3ee5347e1909..1deb61e89ab7 100644 --- a/layouts/partials/ecosystem/registry/entry.html +++ b/layouts/partials/ecosystem/registry/entry.html @@ -129,9 +129,11 @@

Deprecated

{{- .description | markdownify -}} {{ with $package -}} + {{ if not (eq .quickInstall false) }}
Quick Install

{{ (partial .installTemplate .) | markdownify -}}

+ {{ end -}} {{- end -}}
diff --git a/layouts/shortcodes/version-from-registry.md b/layouts/shortcodes/version-from-registry.md index d597de0e3987..cdff2747544f 100644 --- a/layouts/shortcodes/version-from-registry.md +++ b/layouts/shortcodes/version-from-registry.md @@ -1,9 +1,14 @@ {{ $name := (.Get 0) -}} +{{ $noPrefix := default false (.Get 1) -}} {{ with $name -}} {{ with index $.Site.Data.registry . -}} {{ with .package.version -}} - {{ . -}} + {{ if $noPrefix -}} + {{ strings.TrimLeft "v" . -}} + {{ else -}} + {{ . -}} + {{ end -}} {{ else -}} {{ errorf "No 'package.version' in registry entry %q: %s" $name $.Position -}} {{ end -}} diff --git a/static/refcache.json b/static/refcache.json index c6643b36e81e..ccb0d277510b 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -2971,6 +2971,10 @@ "StatusCode": 200, "LastSeen": "2024-01-18T19:37:01.457649-05:00" }, + "https://github.com/open-telemetry/opentelemetry-collector/releases/tag/cmd%2Fbuilder%2Fv0.95.0": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:42.006164+01:00" + }, "https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.63.0": { "StatusCode": 200, "LastSeen": "2024-01-30T16:04:58.261649-05:00" @@ -6443,6 +6447,10 @@ "StatusCode": 200, "LastSeen": "2024-01-08T12:16:51.070771+01:00" }, + "https://pkg.go.dev/go.opentelemetry.io/collector/cmd/builder": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:30.684687+01:00" + }, "https://pkg.go.dev/go.opentelemetry.io/collector/component#Component": { "StatusCode": 200, "LastSeen": "2024-01-18T19:08:05.029244-05:00" @@ -6467,6 +6475,22 @@ "StatusCode": 200, "LastSeen": "2024-01-18T19:07:49.734386-05:00" }, + "https://pkg.go.dev/go.opentelemetry.io/collector/exporter/debugexporter": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:31.744795+01:00" + }, + "https://pkg.go.dev/go.opentelemetry.io/collector/exporter/otlpexporter": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:32.206669+01:00" + }, + "https://pkg.go.dev/go.opentelemetry.io/collector/processor/batchprocessor": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:33.428723+01:00" + }, + "https://pkg.go.dev/go.opentelemetry.io/collector/receiver/otlpreceiver": { + "StatusCode": 200, + "LastSeen": "2024-03-01T16:49:37.76693+01:00" + }, "https://pkg.go.dev/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp": { "StatusCode": 200, "LastSeen": "2024-01-19T15:36:28.468246594Z" From fb1809346dccc80aaba054c37c60b5754bcef366 Mon Sep 17 00:00:00 2001 From: Mohit Shukla Date: Mon, 11 Mar 2024 21:50:48 +0530 Subject: [PATCH 05/10] Adding bureau.id and dyte as adopters. (#4122) --- data/ecosystem/adopters.yaml | 12 +++++++++++- static/refcache.json | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/data/ecosystem/adopters.yaml b/data/ecosystem/adopters.yaml index fcbb3f0d7157..a082dadc801f 100644 --- a/data/ecosystem/adopters.yaml +++ b/data/ecosystem/adopters.yaml @@ -1,9 +1,14 @@ -# cSpell:ignore Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner +# cSpell:ignore Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner Dyte - name: AppDirect url: https://www.appdirect.com/ components: [Collector] reference: '' contact: '' +- name: Bureau.id + url: https://bureau.id/ + components: [Collector, Python, Go, Lambda] + reference: 'https://tech.bureau.id/connecting-the-dots-with-opentelemetry-part-ii-5ea5f6b06c29' + contact: https://github.com/ethicalmohit - name: Care.com url: https://www.care.com components: [Collector, Go, Java, JavaScript, .NET] @@ -19,6 +24,11 @@ components: [Ruby] reference: '' contact: '' +- name: Dyte + url: https://dyte.io + components: [Go, Javascript] + reference: 'https://dyte.io/blog/opentelemetry-at-dyte-part-i/' + contact: https://github.com/ethicalmohit - name: eBay url: https://www.ebay.com components: [Collector, Java, JavaScript, Go] diff --git a/static/refcache.json b/static/refcache.json index ccb0d277510b..3f0e4863805f 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -1651,6 +1651,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:01:18.598115-05:00" }, + "https://dyte.io/blog/opentelemetry-at-dyte-part-i/": { + "StatusCode": 200, + "LastSeen": "2024-03-11T16:15:19.930537498Z" + }, "https://ebpf.io/": { "StatusCode": 206, "LastSeen": "2024-01-30T05:18:23.588545-05:00" @@ -7323,6 +7327,10 @@ "StatusCode": 206, "LastSeen": "2024-01-18T08:06:30.661915-05:00" }, + "https://tech.bureau.id/connecting-the-dots-with-opentelemetry-part-ii-5ea5f6b06c29": { + "StatusCode": 200, + "LastSeen": "2024-03-11T16:15:18.683685828Z" + }, "https://tech.ebayinc.com/engineering/beats-ebay-collectbeat-a-journey-where-company-and-community-come-together/": { "StatusCode": 200, "LastSeen": "2024-01-18T19:10:52.551331-05:00" From 2115d76bd581535b4aced617cf2ab38ae5d64a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nic=C3=A1cio=20Oliveira=20de=20Sousa?= Date: Mon, 11 Mar 2024 13:27:38 -0300 Subject: [PATCH 06/10] Add VTEX to adopters lists (#4128) --- data/ecosystem/adopters.yaml | 7 ++++++- static/refcache.json | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/data/ecosystem/adopters.yaml b/data/ecosystem/adopters.yaml index a082dadc801f..479a9ff01f13 100644 --- a/data/ecosystem/adopters.yaml +++ b/data/ecosystem/adopters.yaml @@ -1,4 +1,4 @@ -# cSpell:ignore Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner Dyte +# cSpell:ignore Dyte Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner VTEX - name: AppDirect url: https://www.appdirect.com/ components: [Collector] @@ -105,6 +105,11 @@ reference: /blog/2023/end-user-q-and-a-02/ referenceTitle: blog post contact: '' +- name: VTEX + url: https://www.vtex.com/ + components: [Collector, Go, JavaScript, .NET] + reference: 'https://colocatedeventseu2023.sched.com/event/1Jo8E/ingesting-65-tb-of-telemetry-data-daily-through-open-telemetry-protocol-and-collectors-gustavo-pantuza-vtex' + contact: 'sre-observability@vtex.com' - name: Wandera url: https://www.wandera.com/ components: [Collector] diff --git a/static/refcache.json b/static/refcache.json index 3f0e4863805f..8d6ac5ef00a3 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -479,6 +479,10 @@ "StatusCode": 206, "LastSeen": "2024-01-18T19:55:35.480849-05:00" }, + "https://colocatedeventseu2023.sched.com/event/1Jo8E/ingesting-65-tb-of-telemetry-data-daily-through-open-telemetry-protocol-and-collectors-gustavo-pantuza-vtex": { + "StatusCode": 200, + "LastSeen": "2024-03-11T15:46:36.452505974Z" + }, "https://colocatedeventsna2023.sched.com/overview/type/Observability+Day": { "StatusCode": 200, "LastSeen": "2024-01-30T16:04:58.233769-05:00" From 82894a7cd56b06ac1dbc68097a24dd825dd26b1b Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 12 Mar 2024 08:59:14 +0100 Subject: [PATCH 07/10] Auto-update registry versions (fdb0cf7657a8cd9519fe177cde9d512551be241d) (#4134) --- data/registry/collector-builder.yml | 2 +- data/registry/collector-exporter-debug.yml | 2 +- data/registry/collector-exporter-otlp.yml | 2 +- data/registry/collector-processor-batch.yml | 2 +- data/registry/collector-receiver-otlp.yml | 2 +- data/registry/instrumentation-js-aws-sdk.yml | 2 +- data/registry/instrumentation-js-express.yml | 2 +- data/registry/instrumentation-js-graphql.yml | 2 +- data/registry/instrumentation-js-mongodb.yml | 2 +- data/registry/instrumentation-js-pg.yml | 2 +- data/registry/instrumentation-js-postgres.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/registry/collector-builder.yml b/data/registry/collector-builder.yml index 318563ac6386..edc2b020f04c 100644 --- a/data/registry/collector-builder.yml +++ b/data/registry/collector-builder.yml @@ -17,5 +17,5 @@ createdAt: 2023-12-18 package: registry: go name: go.opentelemetry.io/collector/cmd/builder - version: v0.95.0 + version: v0.96.0 quickInstall: false diff --git a/data/registry/collector-exporter-debug.yml b/data/registry/collector-exporter-debug.yml index 89908664c857..22caddc73772 100644 --- a/data/registry/collector-exporter-debug.yml +++ b/data/registry/collector-exporter-debug.yml @@ -16,4 +16,4 @@ createdAt: 2020-11-05 package: registry: go-collector name: go.opentelemetry.io/collector/exporter/debugexporter - version: v0.95.0 + version: v0.96.0 diff --git a/data/registry/collector-exporter-otlp.yml b/data/registry/collector-exporter-otlp.yml index 87d6b4330945..e127465b5c31 100644 --- a/data/registry/collector-exporter-otlp.yml +++ b/data/registry/collector-exporter-otlp.yml @@ -16,4 +16,4 @@ createdAt: 2020-11-05 package: registry: go-collector name: go.opentelemetry.io/collector/exporter/otlpexporter - version: v0.95.0 + version: v0.96.0 diff --git a/data/registry/collector-processor-batch.yml b/data/registry/collector-processor-batch.yml index 7ea1fd579eae..7765d65e5113 100644 --- a/data/registry/collector-processor-batch.yml +++ b/data/registry/collector-processor-batch.yml @@ -18,4 +18,4 @@ createdAt: 2021-02-24 package: registry: go-collector name: go.opentelemetry.io/collector/processor/batchprocessor - version: v0.95.0 + version: v0.96.0 diff --git a/data/registry/collector-receiver-otlp.yml b/data/registry/collector-receiver-otlp.yml index 75ca6c9559d0..accbc89658a8 100644 --- a/data/registry/collector-receiver-otlp.yml +++ b/data/registry/collector-receiver-otlp.yml @@ -16,4 +16,4 @@ createdAt: 2020-11-05 package: registry: go-collector name: go.opentelemetry.io/collector/receiver/otlpreceiver - version: v0.95.0 + version: v0.96.0 diff --git a/data/registry/instrumentation-js-aws-sdk.yml b/data/registry/instrumentation-js-aws-sdk.yml index c6ddb246bb0d..447bbba9314b 100644 --- a/data/registry/instrumentation-js-aws-sdk.yml +++ b/data/registry/instrumentation-js-aws-sdk.yml @@ -17,4 +17,4 @@ createdAt: 2020-06-15 package: name: '@opentelemetry/instrumentation-aws-sdk' registry: npm - version: 0.39.0 + version: 0.39.1 diff --git a/data/registry/instrumentation-js-express.yml b/data/registry/instrumentation-js-express.yml index 294b5c7efcb9..bc3bdd3ef2bf 100644 --- a/data/registry/instrumentation-js-express.yml +++ b/data/registry/instrumentation-js-express.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-express' - version: 0.36.0 + version: 0.36.1 diff --git a/data/registry/instrumentation-js-graphql.yml b/data/registry/instrumentation-js-graphql.yml index c0630ec34f19..2ea692ae0e6a 100644 --- a/data/registry/instrumentation-js-graphql.yml +++ b/data/registry/instrumentation-js-graphql.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-graphql' - version: 0.38.0 + version: 0.38.1 diff --git a/data/registry/instrumentation-js-mongodb.yml b/data/registry/instrumentation-js-mongodb.yml index 341054d025aa..d9f933366b20 100644 --- a/data/registry/instrumentation-js-mongodb.yml +++ b/data/registry/instrumentation-js-mongodb.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-mongodb' - version: 0.40.0 + version: 0.41.0 diff --git a/data/registry/instrumentation-js-pg.yml b/data/registry/instrumentation-js-pg.yml index 052d42e7ea76..a9489ddbb822 100644 --- a/data/registry/instrumentation-js-pg.yml +++ b/data/registry/instrumentation-js-pg.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-pg' - version: 0.39.0 + version: 0.39.1 diff --git a/data/registry/instrumentation-js-postgres.yml b/data/registry/instrumentation-js-postgres.yml index 39669fe4043f..aab7cdbb75f0 100644 --- a/data/registry/instrumentation-js-postgres.yml +++ b/data/registry/instrumentation-js-postgres.yml @@ -17,4 +17,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-pg' - version: 0.39.0 + version: 0.39.1 From c1fdb67158eb41e0cf81b67efe86bd1367e9750d Mon Sep 17 00:00:00 2001 From: Hope Oluwalolope Date: Tue, 12 Mar 2024 01:31:18 -0700 Subject: [PATCH 08/10] Update user feedback sessions scheduling links in kubecon-eu blogpost (#4136) --- content/en/blog/2024/kubecon-eu.md | 12 ++++++------ static/refcache.json | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/content/en/blog/2024/kubecon-eu.md b/content/en/blog/2024/kubecon-eu.md index 8b511f8bf858..bb17adc7ceb0 100644 --- a/content/en/blog/2024/kubecon-eu.md +++ b/content/en/blog/2024/kubecon-eu.md @@ -117,16 +117,16 @@ your OpenTelemetry adoption, implementation, and usage. To join a feedback session, book online below. All times in Central European Time (CET). -- **March 20th, 10:45-11:45:** - [End User Feedback Session - Profiling](https://calendly.com/otel-euwg/end-user-feedback-sessions-1?month=2024-03) - **March 20th, 11:45-12:45:** - [End User Feedback Session - .NET & .NET Auto-Instrumentation](https://calendly.com/otel-euwg/end-user-feedback-sessions-2?month=2024-03) + [End User Feedback Session - .NET & .NET Auto-Instrumentation](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session?month=2024-03) - **March 20th, 15:00-16:00:** - [End User Feedback Session - JavaScript](https://calendly.com/otel-euwg/end-user-feedback-sessions-3?month=2024-03) + [End User Feedback Session - JavaScript](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-javascript?month=2024-03) - **March 21st, 11:00-12:00:** - [End User Feedback Session - Semantic Conventions](https://calendly.com/otel-euwg/end-user-feedback-sessions-4?month=2024-03) + [End User Feedback Session - Semantic Conventions](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-semantic-conventions?month=2024-03) - **March 21st, 14:30-15:30:** - [End User Feedback Session - Comms (website, docs)](https://calendly.com/otel-euwg/end-user-feedback-sessions-5?month=2024-03) + [End User Feedback Session - Comms (website, docs)](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-comms?month=2024-03) +- **March 21th, 15:00-16:00:** + [End User Feedback Session - Profiling](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-profiling?month=2024-03) A maximum of 5 participants will join one SIG maintainer to provide feedback for that SIG. Sessions will be recorded and posted on the diff --git a/static/refcache.json b/static/refcache.json index 8d6ac5ef00a3..75b85d950f03 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -195,6 +195,26 @@ "StatusCode": 206, "LastSeen": "2024-01-30T06:01:19.540115-05:00" }, + "https://calendly.com/euwg-user-feedback-session/end-user-feedback-session": { + "StatusCode": 200, + "LastSeen": "2024-03-12T07:55:41.183146657Z" + }, + "https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-comms": { + "StatusCode": 200, + "LastSeen": "2024-03-12T07:55:43.02820199Z" + }, + "https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-javascript": { + "StatusCode": 200, + "LastSeen": "2024-03-12T07:55:41.8903846Z" + }, + "https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-profiling": { + "StatusCode": 200, + "LastSeen": "2024-03-12T07:55:43.489076907Z" + }, + "https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-semantic-conventions": { + "StatusCode": 200, + "LastSeen": "2024-03-12T07:55:42.553897693Z" + }, "https://calendly.com/otel-euwg/end-user-feedback-sessions-1": { "StatusCode": 200, "LastSeen": "2024-02-28T09:18:31.915956+01:00" @@ -2983,6 +3003,10 @@ "StatusCode": 200, "LastSeen": "2024-03-01T16:49:42.006164+01:00" }, + "https://github.com/open-telemetry/opentelemetry-collector/releases/tag/cmd%2Fbuilder%2Fv0.96.0": { + "StatusCode": 200, + "LastSeen": "2024-03-12T08:09:00.086946856Z" + }, "https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.63.0": { "StatusCode": 200, "LastSeen": "2024-01-30T16:04:58.261649-05:00" From aa1f945b82f72b0887fc4793bcc2febc6078308e Mon Sep 17 00:00:00 2001 From: Yacine Kheddache Date: Tue, 12 Mar 2024 09:53:40 +0100 Subject: [PATCH 09/10] Add Microcks to integration list. (#4120) --- data/ecosystem/integrations.yaml | 7 ++++++- static/refcache.json | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/data/ecosystem/integrations.yaml b/data/ecosystem/integrations.yaml index 162ac0408112..bb69c9236ff7 100644 --- a/data/ecosystem/integrations.yaml +++ b/data/ecosystem/integrations.yaml @@ -1,4 +1,4 @@ -# cSpell:ignore containerd buildx Quarkus Cerbos flagd flipt KEDA Kyverno Dapr rustup GORM Otterize Dubbo +# cSpell:ignore containerd buildx Quarkus Cerbos flagd flipt KEDA Kyverno Dapr rustup GORM Otterize Dubbo Microcks - name: containerd url: https://containerd.io/ docsUrl: https://github.com/containerd/containerd/blob/main/docs/tracing.md @@ -186,3 +186,8 @@ docsUrl: https://cn.dubbo.apache.org/en/blog/2024/01/31/tracing-dubbo-with-opentelemetry/ components: [Java] oss: true +- name: Microcks + url: https://microcks.io/ + docsUrl: https://microcks.io/documentation/using/monitoring/ + components: [Java] + oss: true diff --git a/static/refcache.json b/static/refcache.json index 75b85d950f03..4d0e7853c66f 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -4987,6 +4987,14 @@ "StatusCode": 200, "LastSeen": "2024-01-18T08:06:14.054263-05:00" }, + "https://microcks.io/": { + "StatusCode": 206, + "LastSeen": "2024-03-12T09:44:49.348708+01:00" + }, + "https://microcks.io/documentation/using/monitoring/": { + "StatusCode": 206, + "LastSeen": "2024-03-12T09:44:49.906991+01:00" + }, "https://micrometer.io/": { "StatusCode": 206, "LastSeen": "2024-01-18T19:02:08.769984-05:00" From 06822034579568772b5e3a2244101131568186b5 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Tue, 12 Mar 2024 18:53:59 -0400 Subject: [PATCH 10/10] [demo] Reintroduce services/featureflagservice alias (#4146) --- content/en/docs/demo/feature-flags.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/en/docs/demo/feature-flags.md b/content/en/docs/demo/feature-flags.md index bc2202648117..c4cdb176428a 100644 --- a/content/en/docs/demo/feature-flags.md +++ b/content/en/docs/demo/feature-flags.md @@ -1,6 +1,9 @@ --- title: Feature Flags -aliases: [feature_flags] +aliases: + - feature_flags + - services/feature-flag + - services/featureflagservice cSpell:ignore: flagd OLJCESPC7Z ---