Skip to content

Commit

Permalink
Merge branch 'main' into registry-updates-1223
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Dec 4, 2023
2 parents 9fbc149 + 6e2650a commit ae96ac0
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 14 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
with: { name: build-log-etc }
- run: npm run diff:fail
- name: Fail when refcache contains entries with HTTP status 4XX
run: |
if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
exit 1
fi
- name: Does the refcache need updating?
run: npm run diff:fail

check-build-log-for-issues:
name: WARNINGS in build log?
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2023/any-metric-receiver.md
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ or incorporate metrics (with gauge support) into your preferred OTel CLI tool!
In this post you learned how to use a _catch-all_ receiver like the Carbon
Receiver to feed any metric into your OpenTelemetry Collector. Use this approach
when none of the available receivers meet your needs and you don't want to write
your won receiver in Go.
your own receiver in Go.

You learned how to send your metrics to the OpenTelemetry Collector directly
using OTLP and `curl`. Use this approach when you cannot modify the pipelines of
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/collector/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Collector
description: Vendor-agnostic way to receive, process and export telemetry data.
aliases: [collector/about]
cascade:
vers: 0.90.0
vers: 0.90.1
weight: 10
---

Expand Down
6 changes: 2 additions & 4 deletions content/en/docs/demo/services/checkout.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ as part of the gRPC server creation.

```go
var srv = grpc.NewServer(
grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()),
grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor()),
grpc.StatsHandler(otelgrpc.NewServerHandler()),
)
```

Expand All @@ -68,8 +67,7 @@ by wrapping the gRPC client with instrumentation
func createClient(ctx context.Context, svcAddr string) (*grpc.ClientConn, error) {
return grpc.DialContext(ctx, svcAddr,
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
)
}
```
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/demo/services/feature-flag.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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
we need to call the setup methods of their instrumentation packages before
starting the Supervisor.

This is done in the `application.ex` as follows:
Expand Down
6 changes: 2 additions & 4 deletions content/en/docs/demo/services/product-catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ as part of the gRPC server creation.

```go
srv := grpc.NewServer(
grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()),
grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor()),
grpc.StatsHandler(otelgrpc.NewServerHandler()),
)
```

Expand All @@ -69,8 +68,7 @@ wrapping the gRPC client with instrumentation.
func createClient(ctx context.Context, svcAddr string) (*grpc.ClientConn, error) {
return grpc.DialContext(ctx, svcAddr,
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
)
}
```
Expand Down
4 changes: 3 additions & 1 deletion content/en/docs/instrumentation/net/manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,9 @@ available by

## Logs

The logs API & SDK are currently under development.
The documentation for the logs API and SDK is missing. You can help make it
available by
[editing this page](https://github.com/open-telemetry/opentelemetry.io/edit/main/content/en/docs/instrumentation/net/manual.md).

## Next steps

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/instrumentation/ruby/exporters.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ can change the endpoint by setting the `OTEL_EXPORTER_OTLP_ENDPOINT`
accordingly:

```sh
env OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost:4318/v1/traces" rails server -p 8080
env OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost:4318" rails server -p 8080
```

To try out the OTLP exporter quickly and see your traces visualized at the
Expand Down
7 changes: 7 additions & 0 deletions data/ecosystem/vendors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -349,3 +349,10 @@
contact: '[email protected]'
oss: false
commercial: true
- name: VictoriaMetrics
distribution: false
nativeOTLP: true
url: 'https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/docs#sending-data-via-opentelemetry'
contact: 'https://github.com/hagen1778'
oss: true
commercial: true

0 comments on commit ae96ac0

Please sign in to comment.