[DOC] Update instrumentation and community pages (grafana#3106)

* Update instrumentation and community pages * Added client libraries to Jaegar wording * Update docs/sources/tempo/getting-started/instrumentation.md * Apply suggestions from code review Co-authored-by: Jack Baldry <[email protected]> --------- Co-authored-by: Jack Baldry <[email protected]>
VoIPGRID · Nov 8, 2023 · dc760c6 · dc760c6
1 parent 4731be1
commit dc760c6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/docs/sources/tempo/community/_index.md b/docs/sources/tempo/community/_index.md
@@ -4,16 +4,22 @@ description: Participate in and contribute to the Tempo open source community.
 weight: 900
 ---
 
+# Community
+
+If you are interested in distributed tracing, consider participating and contributing to the [open source Tempo project](https://github.com/grafana/tempo).
+
+Want to learn more about open source communities? Read David Allen's blog post, [What makes a good open source community?](/blog/2023/09/01/what-makes-a-good-open-source-community/) on the Grafana website.
+
 ## Communicate
 
 - [Grafana Slack](https://slack.grafana.com/) #tempo channel
 - [Community Forum](https://community.grafana.com/c/grafana-tempo/40) - for questions/feedback.
 - [Community Call](https://docs.google.com/document/d/1yGsI6ywU-PxZBjmq3p3vAXr9g5yBXSDk4NU8LGo8qeY/edit#) - Monthly
-  on the second thursday at 1630 UTC.
+  on the second Thursday at 1630 UTC.
   Recordings available [online](https://www.youtube.com/playlist?list=PLDGkOdUX1Ujqe8WZ8T1h2pNjpll0t-KLw).
-- [Google Groups](https://groups.google.com/forum/#!forum/tempo-users)
 
 ## Contribute
+
 This page lists resources for developers who want to contribute to the Tempo software ecosystem.
 
 - [Governance](https://github.com/grafana/tempo/blob/main/GOVERNANCE.md)

diff --git a/docs/sources/tempo/getting-started/instrumentation.md b/docs/sources/tempo/getting-started/instrumentation.md
@@ -20,10 +20,11 @@ Most of these guides include complete end-to-end examples with Grafana, Loki, Mi
 Most of the popular client instrumentation frameworks have SDKs in the most commonly used programming languages.
 You should pick one according to your application needs.
 
+OpenTelemetry has the most active development in the community and may be a better long-term choice.
+
 * [OpenTelemetry](https://opentelemetry.io/docs/concepts/instrumenting/)
-* [OpenTracing/Jaeger](https://www.jaegertracing.io/docs/latest/client-libraries/)
 * [Zipkin](https://zipkin.io/pages/tracers_instrumentation)
-
+* [OpenTracing/Jaeger](https://www.jaegertracing.io/docs/latest/client-libraries/) (deprecated)
 
 ## OpenTelemetry
 
@@ -41,10 +42,10 @@ information from a client application with minimal manual instrumentation of the
     - [Java auto-instrumentation with Java and OTel Java Agent](/docs/opentelemetry/instrumentation/java/javaagent/)
     - [Automatic instrumentation of Spring Boot 3.x applications with Grafana OpenTelemetry Starter](/docs/opentelemetry/instrumentation/java/spring-starter/)
 * [OpenTelemetry .NET auto-instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation)
+  * [How to configure OpenTelemetry .NET automatic instrumentation with Grafana Cloud](/blog/2023/10/31/how-to-configure-opentelemetry-.net-automatic-instrumentation-with-grafana-cloud)
 * [OpenTelemetry Python auto-instrumentation](https://github.com/open-telemetry/opentelemetry-python-contrib)
 * [OpenTelemetry Go auto-instrumentation](https://github.com/open-telemetry/opentelemetry-go-instrumentation) and [documentation](https://opentelemetry.io/docs/instrumentation/go/getting-started/)
 
-
 ### Additional OTel resources
 
 - [Java HTTP Metrics from OpenTelemetry Traces](/docs/opentelemetry/instrumentation/java/metrics-from-traces/)
@@ -54,18 +55,23 @@ information from a client application with minimal manual instrumentation of the
 
 ## Other instrumentation resources
 
-### Jaeger
-
-- [Jaeger Language Specific Instrumentation](https://www.jaegertracing.io/docs/latest/client-libraries/)
-
 ### Zipkin
 
 - [Zipkin Language Specific Instrumentation](https://zipkin.io/pages/tracers_instrumentation.html)
 
+### Jaeger
+
+{{% admonition type="note" %}}
+Jaegar client libraries have been deprecated. For more information, refer to the [Deprecating Jaeger clients article](https://www.jaegertracing.io/docs/1.50/client-libraries/#deprecating-jaeger-clients). Jaegar now recommends using OpenTelemetry SDKs.
+{{% /admonition %}}
+
+- [Jaeger Language Specific Instrumentation](https://www.jaegertracing.io/docs/latest/client-libraries/)
+
 ## Grafana Blog
 
 The Grafana blot periodically features instrumentation posts.
 
+- [How to configure OpenTelemetry .NET automatic instrumentation with Grafana Cloud](/blog/2023/10/31/how-to-configure-opentelemetry-.net-automatic-instrumentation-with-grafana-cloud)
 - [Java Spring Boot Auto-Instrumentation](/blog/2021/02/03/auto-instrumenting-a-java-spring-boot-application-for-traces-and-logs-using-opentelemetry-and-grafana-tempo/)
 - [Go + OpenMetrics Exemplars](/blog/2020/11/09/trace-discovery-in-grafana-tempo-using-prometheus-exemplars-loki-2.0-queries-and-more/)
 - [.NET](/blog/2021/02/11/instrumenting-a-.net-web-api-using-opentelemetry-tempo-and-grafana-cloud/)