Skip to content

Commit

Permalink
[IA] Relocate .NET Automatic pages to new Zero-code section (#4532)
Browse files Browse the repository at this point in the history
Signed-off-by: svrnm <neumanns@cisco.com>
  • Loading branch information
svrnm authored May 24, 2024
1 parent 9652bb9 commit 1a5067e
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 22 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ content/en/docs/contributing/ @open-telemetry/docs-approvers @open-telemet
content/zh/ @open-telemetry/docs-zh-approvers
content/en/docs/zero-code/java/ @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
content/en/docs/zero-code/js/ @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
content/en/docs/zero-code/net/ @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers

4 changes: 2 additions & 2 deletions content/en/blog/2023/end-user-discussions-03.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ agent to the host metrics receiver for infrastructure monitoring.
maturing in OTel; for example, the Java JAR agent takes care of instrumenting
[most libraries](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/supported-libraries.md#libraries--frameworks)
that are used by applications. Auto-instrumentation is also available for
[Python](/docs/languages/python/automatic/),
[.NET](/docs/languages/net/automatic/), and [Node.js](/docs/zero-code/js/).
[Python](/docs/languages/python/automatic/), [.NET](/docs/zero-code/net/), and
[Node.js](/docs/zero-code/js/).
- If you’re using Kubernetes, they can use the
[OTel operator](https://github.com/open-telemetry/opentelemetry-operator),
which takes care of instrumentations for applications deployed on K8s. The
Expand Down
3 changes: 1 addition & 2 deletions content/en/blog/2023/otel-dotnet-auto-instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ package that simplify the task of deploying and configuring the collection of
telemetry. The automatic instrumentation is fully compatible with manual
instrumentation in case you need to send custom spans or metrics.

To get started, [read the documentation](/docs/languages/net/automatic) or
browse the
To get started, [read the documentation](/docs/zero-code/net) or browse the
[examples](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/tree/main/examples)
for demonstrations of different instrumentation scenarios covered by the
OpenTelemetry .NET Automatic Instrumentation.
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/instrumentation/zero-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Other configuration options are available, including:

Automatic instrumentation is available for the following languages:

- [.NET](/docs/languages/net/automatic/)
- [.NET](/docs/zero-code/net/)
- [Java](/docs/zero-code/java/)
- [JavaScript](/docs/zero-code/js/)
- [PHP](/docs/languages/php/automatic/)
Expand Down
3 changes: 1 addition & 2 deletions content/en/docs/kubernetes/operator/automatic.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@ spec:
#### Learn more {#dotnet-learn-more}
For more details, see
[.NET Auto Instrumentation docs](/docs/languages/net/automatic/).
For more details, see [.NET Auto Instrumentation docs](/docs/zero-code/net/).
### Java
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/languages/net/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ weight: 10
This page will show you how to get started with OpenTelemetry in .NET.

If you are looking for a way to automatically instrument your application, check
out [this guide](/docs/languages/net/automatic/getting-started/).
out [this guide](/docs/zero-code/net/getting-started/).

You will learn how you can instrument a simple .NET application, in such a way
that [traces][], [metrics][] and [logs][] are emitted to the console.
Expand Down Expand Up @@ -264,7 +264,7 @@ Value: Sum: 1330.4766000000002 Count: 5 Min: 50.0333 Max: 465.7936
For more:

- Run this example with another [exporter][] for telemetry data.
- Try [automatic instrumentation](../automatic/) on one of your own apps.
- Try [automatic instrumentation](/docs/zero-code/net/) on one of your own apps.
- Learn about [manual instrumentation][] and try out more
[examples](/docs/languages/net/examples/).
- Take a look at the [OpenTelemetry Demo](/docs/demo/), which includes .NET
Expand Down
9 changes: 5 additions & 4 deletions content/en/docs/languages/net/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cSpell:ignore: dicelib rolldice

On this page you will learn how you can add traces, metrics and logs to your
code manually. You are not limited to using one kind of instrumentation: you can
also use [automatic instrumentation](/docs/languages/net/automatic/) to get
started and then enrich your code with manual instrumentation as needed.
also use [automatic instrumentation](/docs/zero-code/net/) to get started and
then enrich your code with manual instrumentation as needed.

Also, for libraries your code depends on, you don't have to write
instrumentation code yourself, since they might be already instrumented or there
Expand Down Expand Up @@ -696,5 +696,6 @@ things like inbound and outbound HTTP requests and more.
You'll also want to configure an appropriate exporter to
[export your telemetry data](../exporters/) to one or more telemetry backends.

You can also check the [automatic instrumentation for .NET](../automatic/),
which is currently in beta.
You can also check the
[automatic instrumentation for .NET](/docs/zero-code/net/), which is currently
in beta.
4 changes: 2 additions & 2 deletions content/en/docs/languages/net/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ You'll also want to configure an appropriate exporter to
telemetry backends.

You can also check the
[automatic instrumentation for .NET](/docs/languages/net/automatic), which is
currently in beta.
[automatic instrumentation for .NET](/docs/zero-code/net), which is currently in
beta.

[opentelemetry-dotnet]: https://github.com/open-telemetry/opentelemetry-dotnet
4 changes: 2 additions & 2 deletions content/en/docs/languages/net/netframework.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,5 @@ You'll also want to configure an appropriate exporter to
telemetry backends.

You can also check the
[automatic instrumentation for .NET](/docs/languages/net/automatic), which is
currently in beta.
[automatic instrumentation for .NET](/docs/zero-code/net), which is currently in
beta.
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
---
title: Automatic Instrumentation
title: .NET Automatic Instrumentation
description: Send traces and metrics from .NET applications and services.
linkTitle: Automatic
cSpell:ignore: coreutils HKLM iisreset myapp
weight: 30
redirects: [{ from: /docs/languages/net/automatic/*, to: ':splat' }]
---

Use the OpenTelemetry .NET Automatic Instrumentation to send traces and metrics
from .NET applications and services to observability backends without having to
modify their source code.

To learn how to manually instrument your service or application code, see
[Manual instrumentation](../instrumentation).
To learn how to instrument your service or application code, read
[Manual instrumentation](/docs/languages/net/instrumentation).

## Compatibility

Expand Down Expand Up @@ -294,4 +295,5 @@ For general troubleshooting steps and solutions to specific issues, see

After you have automatic instrumentation configured for your app or service, you
might want to [send custom traces and metrics](./custom) or add
[manual instrumentation](../instrumentation) to collect custom telemetry data.
[manual instrumentation](/docs/languages/net/instrumentation) to collect custom
telemetry data.
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ To create your custom metrics manually, follow these steps:

## Further reading

- [OpenTelemetry.io documentation for .NET Manual Instrumentation](../../instrumentation#setting-up-an-activitysource)
- [OpenTelemetry.io documentation for .NET Manual Instrumentation](/docs/languages/net/instrumentation#setting-up-an-activitysource)

1 comment on commit 1a5067e

@kellis5137
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this documentation, are all the different languages supposed to have the same Instrumentation manifest? Because they are the same for each language:

kubectl apply -f - <<EOF apiVersion: opentelemetry.io/v1alpha1 kind: Instrumentation metadata: name: demo-instrumentation spec: exporter: endpoint: http://demo-collector:4318 propagators: - tracecontext - baggage sampler: type: parentbased_traceidratio argument: "1" EOF

Please sign in to comment.