Skip to content

Commit

Permalink
Merge branch 'main' into docs/es/contributing-new-content
Browse files Browse the repository at this point in the history
  • Loading branch information
TineoC authored Sep 30, 2024
2 parents ff9c04a + ec6efec commit 99cf51c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 18 deletions.
13 changes: 9 additions & 4 deletions content/en/docs/collector/custom-collector.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,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
Expand All @@ -144,8 +142,6 @@ collector distribution:
The `builder-config.yaml` manifest file will look like this after adding the
components:

> builder-config.yaml

<!-- prettier-ignore -->
```yaml
dist:
Expand All @@ -170,6 +166,15 @@ receivers:
go.opentelemetry.io/collector/receiver/otlpreceiver {{% version-from-registry collector-receiver-otlp %}}
```
{{% 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`.

{{% /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
Expand Down
2 changes: 0 additions & 2 deletions content/en/docs/languages/java/sdk.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
title: Manage Telemetry with SDK
linkTitle: Manage Telemetry with SDK
weight: 11
aliases: [sdk-concepts]
cSpell:ignore: autoconfigured FQCNs Interceptable Logback okhttp
---

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/python/propagation.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ First, on the sending service, inject the current `context`:
```python
from flask import Flask
import requests
from opentelemetry import trace, propagators, baggage
from opentelemetry import trace, baggage
from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
from opentelemetry.baggage.propagation import W3CBaggagePropagator
from opentelemetry.sdk.trace import TracerProvider
Expand Down
6 changes: 5 additions & 1 deletion data/registry/collector-exporter-apiclarity.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cSpell:ignore apiclarity
# cSpell:ignore apiclarity apiclarityexporter openclarity
title: APIClarity HTTP Exporter
registryType: exporter
language: collector
Expand All @@ -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
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"ajv-errors": "^3.0.0",
"ajv-formats": "^3.0.1",
"autoprefixer": "^10.4.20",
"cspell": "^8.14.2",
"cspell": "^8.14.4",
"gulp": "^5.0.0",
"hugo-extended": "0.133.0",
"js-yaml": "^4.1.0",
Expand All @@ -129,26 +129,26 @@
"textlint": "^14.2.0",
"textlint-filter-rule-allowlist": "^4.0.0",
"textlint-filter-rule-comments": "^1.2.2",
"textlint-rule-terminology": "^5.2.6",
"textlint-rule-terminology": "^5.2.9",
"through2": "^4.0.2",
"yargs": "^17.7.2"
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-web": "^0.41.0",
"@opentelemetry/context-zone": "^1.25.1",
"@opentelemetry/core": "^1.25.1",
"@opentelemetry/context-zone": "^1.26.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/resources": "^1.25.1",
"@opentelemetry/sdk-trace-base": "^1.25.1",
"@opentelemetry/sdk-trace-web": "^1.25.1",
"@opentelemetry/semantic-conventions": "^1.26.0",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/sdk-trace-web": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"path": "^0.12.7"
},
"optionalDependencies": {
"netlify-cli": "^17.34.3",
"npm-check-updates": "^17.1.0"
"netlify-cli": "^17.36.2",
"npm-check-updates": "^17.1.3"
},
"enginesComment": "Ensure that engines.node value stays consistent with the project's .nvmrc",
"engines": {
Expand Down
4 changes: 4 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -10799,6 +10799,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"
Expand Down

0 comments on commit 99cf51c

Please sign in to comment.