diff --git a/content/en/docs/concepts/glossary.md b/content/en/docs/concepts/glossary.md index 8d00ac455cfe..43ecaf5f1bd2 100644 --- a/content/en/docs/concepts/glossary.md +++ b/content/en/docs/concepts/glossary.md @@ -104,6 +104,11 @@ transverses process, network and security boundaries. More on Distributed Tracing [here][distributed tracing]. +### **Distribution** + +A distribution is a wrapper around an upstream OpenTelemetry repository with +some customizations. See [more][distribution]. + ### **Event** Something that happened where representation depends on the @@ -338,6 +343,7 @@ on web pages when requested. See [more][zpages]. [context propagation]: /docs/specs/otel/overview#context-propagation [dag]: https://en.wikipedia.org/wiki/Directed_acyclic_graph [distributed tracing]: /docs/concepts/signals/traces/ +[distribution]: /docs/concepts/distributions/ [field]: /docs/specs/otel/logs/data-model#field-kinds [http]: https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol [json]: https://en.wikipedia.org/wiki/JSON diff --git a/content/en/docs/instrumentation/java/_index.md b/content/en/docs/instrumentation/java/_index.md index ee92b9e2a9f3..a9d657e5ddf1 100644 --- a/content/en/docs/instrumentation/java/_index.md +++ b/content/en/docs/instrumentation/java/_index.md @@ -7,7 +7,7 @@ aliases: [/java, /java/metrics, /java/tracing] cascade: vers: instrumentation: 1.32.0 - otel: 1.32.0 + otel: 1.33.0 semconv: 1.23.1 weight: 18 --- diff --git a/content/en/docs/instrumentation/net/getting-started.md b/content/en/docs/instrumentation/net/getting-started.md index 82a86a78f632..37eadeabc2ca 100644 --- a/content/en/docs/instrumentation/net/getting-started.md +++ b/content/en/docs/instrumentation/net/getting-started.md @@ -46,6 +46,8 @@ code: ```csharp using System.Globalization; +using Microsoft.AspNetCore.Mvc; + var builder = WebApplication.CreateBuilder(args); var app = builder.Build(); @@ -65,6 +67,11 @@ string HandleRollDice([FromServices]ILogger logger, string? player) return result.ToString(CultureInfo.InvariantCulture); } +int RollDice() +{ + return Random.Shared.Next(1, 7); +} + app.MapGet("/rolldice/{player?}", HandleRollDice); app.Run(); @@ -114,7 +121,21 @@ that will generate the telemetry, and set them up. 2. Setup the OpenTelemetry code + In Program.cs, replace the following lines: + + ```csharp + var builder = WebApplication.CreateBuilder(args); + var app = builder.Build(); + ``` + + With: + ```csharp + using OpenTelemetry.Logs; + using OpenTelemetry.Metrics; + using OpenTelemetry.Resources; + using OpenTelemetry.Trace; + var builder = WebApplication.CreateBuilder(args); const string serviceName = "roll-dice"; diff --git a/content/en/docs/security/_index.md b/content/en/docs/security/_index.md new file mode 100644 index 000000000000..27d2cfac5544 --- /dev/null +++ b/content/en/docs/security/_index.md @@ -0,0 +1,4 @@ +--- +title: Security +weight: 150 +--- diff --git a/content/en/docs/security/cve.md b/content/en/docs/security/cve.md new file mode 100644 index 000000000000..3c6b8fb18730 --- /dev/null +++ b/content/en/docs/security/cve.md @@ -0,0 +1,74 @@ +--- +title: Common Vulnerabilities and Exposures +weight: 102 +--- + +This is a list of reported Common Vulnerabilities and Exposures (CVEs) across +all repositories in the +[OpenTelemetry organization on GitHub](https://github.com/open-telemetry/). The +raw data is stored in the +[sig-security](https://github.com/open-telemetry/sig-security) repository, and +it is refreshed daily. + + + + + + + + + + + + +
CVE IDIssue SummarySeverityRepository
+ + diff --git a/static/refcache.json b/static/refcache.json index 80a2b3fd695d..1fe39ea2a263 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -2551,6 +2551,10 @@ "StatusCode": 200, "LastSeen": "2023-06-30T08:31:22.656334-04:00" }, + "https://github.com/open-telemetry/": { + "StatusCode": 200, + "LastSeen": "2023-12-08T15:19:55.887939-08:00" + }, "https://github.com/open-telemetry/community": { "StatusCode": 200, "LastSeen": "2023-06-30T09:28:03.502113-04:00" @@ -3723,6 +3727,10 @@ "StatusCode": 200, "LastSeen": "2023-11-03T20:22:42.689401141Z" }, + "https://github.com/open-telemetry/sig-security": { + "StatusCode": 200, + "LastSeen": "2023-12-07T16:14:09.891942-08:00" + }, "https://github.com/opentracing": { "StatusCode": 200, "LastSeen": "2023-06-30T08:40:39.909083-04:00"