Skip to content

Commit

Permalink
Merge branch 'main' into more-shortcodes-for-exporter-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Feb 7, 2024
2 parents dca469d + 89f1b60 commit 8a91b85
Show file tree
Hide file tree
Showing 27 changed files with 192 additions and 29 deletions.
2 changes: 1 addition & 1 deletion content/en/docs/languages/cpp/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cSpell:ignore: decltype labelkv nostd nullptr

<!-- markdownlint-disable no-duplicate-heading -->

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/erlang/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ weight: 30
description: Instrumentation for OpenTelemetry Erlang/Elixir
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: Manual instrumentation for OpenTelemetry Go
cSpell:ignore: fatalf otlptrace sdktrace sighup
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
24 changes: 14 additions & 10 deletions content/en/docs/languages/go/resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Resources should be assigned to a tracer provider at its initialization, and are
created much like attributes:

```go
resources := resource.NewWithAttributes(
res := resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceNameKey.String("myService"),
semconv.ServiceVersionKey.String("1.0.0"),
Expand All @@ -19,7 +19,7 @@ resources := resource.NewWithAttributes(

provider := sdktrace.NewTracerProvider(
...
sdktrace.WithResource(resources),
sdktrace.WithResource(res),
)
```

Expand All @@ -36,13 +36,17 @@ hosting that operating system instance, or any number of other resource
attributes.

```go
resources := resource.New(context.Background(),
resource.WithFromEnv(), // pull attributes from OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
resource.WithProcess(), // This option configures a set of Detectors that discover process information
resource.WithOS(), // This option configures a set of Detectors that discover OS information
resource.WithContainer(), // This option configures a set of Detectors that discover container information
resource.WithHost(), // This option configures a set of Detectors that discover host information
resource.WithDetectors(thirdparty.Detector{}), // Bring your own external Detector implementation
resource.WithAttributes(attribute.String("foo", "bar")), // Or specify resource attributes directly
res, err := resource.New(context.Background(),
resource.WithFromEnv(), // Pull attributes from OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables.
resource.WithTelemetrySDK(), // Provide information about the OpenTelemetry SDK used.
resource.WithProcess(), // Discover and provide process information.
resource.WithOS(), // Discover and provide OS information.
resource.WithContainer(), // Discover and provide container information.
resource.WithHost(), // Discover and provide information.
resource.WithAttributes(attribute.String("foo", "bar")), // Add custom resource attributes.
// resource.WithDetectors(thirdparty.Detector{}), // Bring your own external Detector implementation.
)
if err != nil {
log.Println(err) // Log issues during resource creation. Note that resource.New still returns a resource.
}
```
4 changes: 2 additions & 2 deletions content/en/docs/languages/java/automatic/spring-boot.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ with the OpenTelemetry
## Automatic instrumentation

Autoconfigures OpenTelemetry instrumentation for
[spring-web](#spring-web-autoconfiguration) ,
[spring-web](#spring-web-autoconfiguration),
[spring-webmvc](#spring-web-mvc-autoconfiguration), and
[spring-webflux](#spring-webflux-autoconfiguration). Leverages Spring Aspect
Oriented Programming, dependency injection, and bean post-processing to trace
Expand Down Expand Up @@ -476,7 +476,7 @@ autoconfiguration features with an annotation or the Zipkin starter.

### Spring support

Autoconfiguration is natively supported by Springboot applications. To enable
Autoconfiguration is natively supported by Spring Boot applications. To enable
these features in "vanilla" use `@EnableOpenTelemetry` to complete a component
scan of this package.

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cSpell:ignore: Autowired customizer logback loggable multivalued rolldice spring

<!-- markdownlint-disable no-duplicate-heading -->

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

{{% alert title="Note" color="info" %}}

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/js/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cSpell:ignore: dicelib Millis rolldice
description: Instrumentation for OpenTelemetry JavaScript
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

{{% alert title="Note" color="info" %}}

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/net/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ aliases: [manual]
description: Instrumentation for OpenTelemetry .NET
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## A note on terminology

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/php/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cSpell:ignore: guzzlehttp myapp

<!-- markdownlint-disable no-duplicate-heading -->

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Example app preparation {#example-app}

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/python/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cSpell:ignore: millis ottrace textmap

<!-- markdownlint-disable no-duplicate-heading -->

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/ruby/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: Instrumentation for OpenTelemetry Ruby
cSpell:ignore: SIGHUP
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/swift/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ aliases: [manual]
description: Instrumentation for OpenTelemetry Swift
---

{{% docs/languages/manual-intro %}}
{{% docs/languages/instrumentation-intro %}}

## Setup

Expand Down
7 changes: 6 additions & 1 deletion data/ecosystem/integrations.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cSpell:ignore containerd buildx Quarkus Cerbos flagd flipt KEDA Kyverno Dapr rustup GORM Otterize
# cSpell:ignore containerd buildx Quarkus Cerbos flagd flipt KEDA Kyverno Dapr rustup GORM Otterize Dubbo
- name: containerd
url: https://containerd.io/
docsUrl: https://github.com/containerd/containerd/blob/main/docs/tracing.md
Expand Down Expand Up @@ -181,3 +181,8 @@
docsUrl: https://farfetch.github.io/kafkaflow/docs/guides/open-telemetry
components: [.NET]
oss: true
- name: Dubbo # Provide the latest docs instead of blog url in 2~3 months later. refer to https://github.com/open-telemetry/opentelemetry.io/pull/3908#discussion_r1473133919.
url: https://github.com/apache/dubbo
docsUrl: https://cn.dubbo.apache.org/en/blog/2024/01/31/tracing-dubbo-with-opentelemetry/
components: [Java]
oss: true
7 changes: 7 additions & 0 deletions data/ecosystem/vendors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@
contact: ''
oss: false
commercial: true
- name: Middleware
distribution: true
nativeOTLP: true
url: 'https://docs.middleware.io/open-telemetry'
contact: '[email protected]'
oss: false
commercial: true
- name: New Relic
distribution: false
nativeOTLP: true
Expand Down
24 changes: 24 additions & 0 deletions data/registry/collector-exporter-otelarrow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# cSpell:ignore otelarrowexporter
title: OpenTelemetry Protocol with Apache Arrow Exporter
registryType: exporter
language: collector
tags:
- apache
- arrow
- exporter
- collector
urls:
repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/otelarrowexporter
license: Apache 2.0
description:
Exports telemetry data using [OpenTelemetry Protocol with Apache
Arrow](https://github.com/open-telemetry/otel-arrow) components with support
for both OpenTelemetry Protocol with Apache Arrow and standard OpenTelemetry
Protocol (OTLP) protocol via gRPC.
authors:
- name: OpenTelemetry Authors
createdAt: 2024-02-05
package:
registry: go-collector
name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter
version: v0.93.0
24 changes: 24 additions & 0 deletions data/registry/collector-extension-solarwindsapmsettings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# cSpell:ignore solarwinds solarwindsapmsettingsextension
title: Solarwinds APM Settings extension
registryType: extension
language: collector
tags:
- solarwinds
- apm
- settings
- extension
- collector
urls:
repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/solarwindsapmsettingsextension
license: Apache 2.0
description:
The Solarwinds APM Settings extension gets Solarwinds APM specific settings
from Solarwinds APM collector and `/tmp/solarwinds-apm-settings.json` &
`/tmp/solarwinds-apm-settings-raw` periodically.
authors:
- name: OpenTelemetry Authors
createdAt: 2024-02-05
package:
registry: go-collector
name: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension
version: v0.93.0
21 changes: 21 additions & 0 deletions data/registry/collector-processor-deltatocumulative.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# cSpell:ignore deltatocumulativeprocessor deltatocumulative
title: Delta to cumulative processor
registryType: processor
language: collector
tags:
- deltatocumulative
- processor
- collector
urls:
repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/deltatocumulativeprocessor
license: Apache 2.0
description:
The delta to cumulative processor (`deltatocumulativeprocessor`) converts
metrics from delta temporality to cumulative, by accumulating samples in
memory.
authors:
- name: OpenTelemetry Authors
createdAt: 2024-02-05
package:
registry: go-collector
name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor
20 changes: 20 additions & 0 deletions data/registry/collector-processor-interval.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# cSpell:ignore intervalprocessor
title: Interval Processor
registryType: processor
language: collector
tags:
- interval
- processor
- collector
urls:
repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/intervalprocessor
license: Apache 2.0
description:
The interval processor (`intervalprocessor`) aggregates metrics and
periodically forwards the latest values to the next component in the pipeline.
authors:
- name: OpenTelemetry Authors
createdAt: 2024-02-05
package:
registry: go-collector
name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor
2 changes: 1 addition & 1 deletion data/registry/exporter-ruby-zipkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-11-07
package:
registry: gems
name: opentelemetry-exporter-zipkin
version: 0.23.0
version: 0.23.1
2 changes: 1 addition & 1 deletion data/registry/instrumentation-elixir-ecto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-03-23
package:
registry: hex
name: opentelemetry_ecto
version: 1.1.2
version: 1.2.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-erlang-ecto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-03-23
package:
registry: hex
name: opentelemetry_ecto
version: 1.1.2
version: 1.2.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-autotelic-fastify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2020-08-28
package:
name: '@autotelic/fastify-opentelemetry'
registry: npm
version: 0.18.0
version: 0.19.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-aws-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2020-06-15
package:
name: '@opentelemetry/instrumentation-aws-sdk'
registry: npm
version: 0.38.0
version: 0.38.1
22 changes: 22 additions & 0 deletions data/registry/instrumentation-php-openaiphp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# cSpell:ignore openai
title: OpenTelemetry openai-php/client auto-instrumentation
registryType: instrumentation
language: php
tags:
- openai
- instrumentation
- php
urls:
repo: https://github.com/open-telemetry/opentelemetry-php-contrib/tree/main/src/Instrumentation/OpenAIPHP
license: Apache 2.0
description:
This package provides auto-instrumentation for
[openai-php/client](https://packagist.org/packages/openai-php/client) to help
you understand the interactions with OpenAI compatible services.
authors:
- name: OpenTelemetry Authors
createdAt: 2024-02-05
package:
registry: packagist
name: open-telemetry/opentelemetry-auto-openai-php
version: 0.0.1
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"postcss-cli": "^11.0.0",
"prettier": "^3.0.3",
"require-dir": "^1.2.0",
"textlint": "^13.3.3",
"textlint": "^14.0.1",
"textlint-filter-rule-allowlist": "^4.0.0",
"textlint-filter-rule-comments": "^1.2.2",
"textlint-rule-terminology": "^4.0.1",
Expand Down
Loading

0 comments on commit 8a91b85

Please sign in to comment.