From d3060b994e74366872097241317afb13b1779e23 Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 13 Aug 2024 10:01:37 +0200 Subject: [PATCH 1/8] Add registry tip to ocb Signed-off-by: svrnm --- content/en/docs/collector/custom-collector.md | 14 ++++++++++---- data/registry/collector-exporter-apiclarity.yml | 6 +++++- static/refcache.json | 4 ++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index c2baedeb8a9a..6be0fada79e9 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -119,8 +119,6 @@ the development and testing of components. Go ahead and create a manifest file named `builder-config.yaml` with the following content: -> builder-config.yaml - ```yaml dist: name: otelcol-dev @@ -143,8 +141,6 @@ collector distribution: The `builder-config.yaml` manifest file will look like this after adding the components: -> builder-config.yaml - ```yaml dist: @@ -169,6 +165,16 @@ receivers: go.opentelemetry.io/collector/receiver/otlpreceiver {{% version-from-registry collector-receiver-otlp %}} ``` +{{% alert color="primary" title="Tip" %}} + +To find components that you can add to your collector component, take a look +into the +[OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). +You will not only find what is available, but also the full string you need to +add to your `builder-config.yaml`. + +{{% /alert %}} + ## Step 3 - Generating the Code and Building your Collector's distribution All you need now is to let the `ocb` do it's job, so go to your terminal and diff --git a/data/registry/collector-exporter-apiclarity.yml b/data/registry/collector-exporter-apiclarity.yml index 17ec3a49f6f6..8a586330ac8c 100644 --- a/data/registry/collector-exporter-apiclarity.yml +++ b/data/registry/collector-exporter-apiclarity.yml @@ -1,4 +1,4 @@ -# cSpell:ignore apiclarity +# cSpell:ignore apiclarity apiclarityexporter openclarity title: APIClarity HTTP Exporter registryType: exporter language: collector @@ -15,3 +15,7 @@ authors: urls: repo: https://github.com/openclarity/apiclarity/tree/master/plugins/otel-collector createdAt: 2022-11-28 +package: + name: github.com/openclarity/apiclarity/plugins/otel-collector/apiclarityexporter + registry: go-collector + version: v0.0.0 diff --git a/static/refcache.json b/static/refcache.json index d66fe8deafb4..3ccd8ed8bcae 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -7971,6 +7971,10 @@ "StatusCode": 200, "LastSeen": "2024-08-09T11:01:13.220618-04:00" }, + "https://pkg.go.dev/github.com/openclarity/apiclarity/plugins/otel-collector/apiclarityexporter": { + "StatusCode": 200, + "LastSeen": "2024-08-12T17:56:07.964057+02:00" + }, "https://pkg.go.dev/go.opentelemetry.io/collector/cmd/builder": { "StatusCode": 200, "LastSeen": "2024-03-01T16:49:30.684687+01:00" From c12c36d85540a59ddfa00a41d55974366c07e9e0 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Thu, 5 Sep 2024 16:53:10 +0200 Subject: [PATCH 2/8] Apply suggestions from code review Co-authored-by: Fabrizio Ferri-Benedetti --- content/en/docs/collector/custom-collector.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 6be0fada79e9..29b8f3274618 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -167,10 +167,10 @@ receivers: {{% alert color="primary" title="Tip" %}} -To find components that you can add to your collector component, take a look -into the +To find components that you can add to your custom Collector, take a look +the [OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). -You will not only find what is available, but also the full string you need to +In addition to available components, the Registry provides the full string you need to add to your `builder-config.yaml`. {{% /alert %}} From 30feefc1f237efe99bb4b4dcc291d96111fb018a Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:05:25 +0000 Subject: [PATCH 3/8] Results from /fix:all --- content-modules/opentelemetry-java-examples | 2 +- content/en/docs/collector/custom-collector.md | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/content-modules/opentelemetry-java-examples b/content-modules/opentelemetry-java-examples index 8112da516aac..485368c57cc0 160000 --- a/content-modules/opentelemetry-java-examples +++ b/content-modules/opentelemetry-java-examples @@ -1 +1 @@ -Subproject commit 8112da516aac8632d5c2a772e588d78feca4362a +Subproject commit 485368c57cc0d9816508b71f8908b3fb5f0f481e diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 29b8f3274618..4786fb1f5b7c 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -167,11 +167,10 @@ receivers: {{% alert color="primary" title="Tip" %}} -To find components that you can add to your custom Collector, take a look -the +To find components that you can add to your custom Collector, take a look the [OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). -In addition to available components, the Registry provides the full string you need to -add to your `builder-config.yaml`. +In addition to available components, the Registry provides the full string you +need to add to your `builder-config.yaml`. {{% /alert %}} From 8e2489fe2692ce19944ef0fcc6959ccebde78430 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Fri, 6 Sep 2024 11:16:55 +0200 Subject: [PATCH 4/8] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Juraci Paixão Kröhling --- content/en/docs/collector/custom-collector.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 4786fb1f5b7c..f0bcfac14b6b 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -167,7 +167,7 @@ receivers: {{% alert color="primary" title="Tip" %}} -To find components that you can add to your custom Collector, take a look the +To find components that you can add to your custom Collector, take a look at the [OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). In addition to available components, the Registry provides the full string you need to add to your `builder-config.yaml`. From 0cdf18907ce2a885a034db5f5ccc9218ba84a97e Mon Sep 17 00:00:00 2001 From: svrnm Date: Fri, 6 Sep 2024 11:17:43 +0200 Subject: [PATCH 5/8] fix submodules Signed-off-by: svrnm --- content-modules/opentelemetry-java-examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content-modules/opentelemetry-java-examples b/content-modules/opentelemetry-java-examples index 485368c57cc0..8fe9a11a33af 160000 --- a/content-modules/opentelemetry-java-examples +++ b/content-modules/opentelemetry-java-examples @@ -1 +1 @@ -Subproject commit 485368c57cc0d9816508b71f8908b3fb5f0f481e +Subproject commit 8fe9a11a33affcc4942f2df6668cd6ce787cde3f From 5c8a8b8b1cc0c8ced61a2b627ee72d39ba502f74 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Fri, 6 Sep 2024 11:18:58 +0200 Subject: [PATCH 6/8] Update content/en/docs/collector/custom-collector.md --- content/en/docs/collector/custom-collector.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 0c2d17494669..0eea2a25e678 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -170,7 +170,7 @@ receivers: To find components that you can add to your custom Collector, take a look at the [OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). -In addition to available components, the Registry provides the full string you +In addition to available components, the Registry provides the full name and version you need to add to your `builder-config.yaml`. {{% /alert %}} From 2864668d14728e7526bc6ce8c7badb38b9e21ab1 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 9 Sep 2024 10:48:38 +0200 Subject: [PATCH 7/8] Update content/en/docs/collector/custom-collector.md Co-authored-by: Patrice Chalin --- content/en/docs/collector/custom-collector.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 0eea2a25e678..3b3868f40088 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -168,10 +168,7 @@ receivers: {{% alert color="primary" title="Tip" %}} -To find components that you can add to your custom Collector, take a look at the -[OpenTelemetry Registry](https://opentelemetry.io/ecosystem/registry/?language=collector). -In addition to available components, the Registry provides the full name and version you -need to add to your `builder-config.yaml`. +For a list of components that you can add to your custom collector, see the [OpenTelemetry Registry](/ecosystem/registry/?language=collector). Note that registry entries provide the full name and version you need to add to your `builder-config.yaml`. {{% /alert %}} From 3a5f27c1ee222cdbc16e2dab92ba734f62a4dbcc Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 30 Sep 2024 08:13:52 +0000 Subject: [PATCH 8/8] Results from /fix:all --- content/en/docs/collector/custom-collector.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md index 3b3868f40088..acdc4eac27bd 100644 --- a/content/en/docs/collector/custom-collector.md +++ b/content/en/docs/collector/custom-collector.md @@ -168,7 +168,10 @@ receivers: {{% alert color="primary" title="Tip" %}} -For a list of components that you can add to your custom collector, see the [OpenTelemetry Registry](/ecosystem/registry/?language=collector). Note that registry entries provide the full name and version you need to add to your `builder-config.yaml`. +For a list of components that you can add to your custom collector, see the +[OpenTelemetry Registry](/ecosystem/registry/?language=collector). Note that +registry entries provide the full name and version you need to add to your +`builder-config.yaml`. {{% /alert %}}