Skip to content

Commit

Permalink
Merge branch 'main' into add-sig-practices
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Jun 18, 2024
2 parents f8ae0b2 + 8bae406 commit e5f42ff
Show file tree
Hide file tree
Showing 13 changed files with 113 additions and 54 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ content/en/docs/zero-code/js/ @open-telemetry/docs-approvers @open-te
content/en/docs/zero-code/net/ @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
content/en/ecosystem/demo/ @open-telemetry/demo-approvers @open-telemetry/demo-approvers
content/zh/ @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers
content/ja/ @open-telemetry/docs-maintainers @open-telemetry/docs-ja-approvers

7 changes: 4 additions & 3 deletions content/en/docs/demo/services/cart.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ and resource attributes is performed through environment variables.
```cs
Action<ResourceBuilder> appResourceBuilder =
resource => resource
.AddDetector(new ContainerResourceDetector())
.AddDetector(new HostDetector());
.AddContainerDetector()
.AddHostDetector();

builder.Services.AddOpenTelemetry()
.ConfigureResource(appResourceBuilder)
Expand Down Expand Up @@ -81,7 +81,8 @@ desired instrumentation libraries, exporters, etc.
```cs
Action<ResourceBuilder> appResourceBuilder =
resource => resource
.AddDetector(new ContainerResourceDetector());
.AddContainerDetector()
.AddHostDetector();

builder.Services.AddOpenTelemetry()
.ConfigureResource(appResourceBuilder)
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >-
aliases: [/java, /java/metrics, /java/tracing]
cascade:
vers:
instrumentation: 2.4.0
instrumentation: 2.5.0
otel: 1.39.0
semconv: 1.25.0
weight: 18
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/zero-code/net/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Important environment variables include:
- On .NET 6 and higher, the application must reference
[`Grpc.Net.Client`](https://www.nuget.org/packages/Grpc.Net.Client/) to use
the `grpc` OTLP exporter protocol. For example, by adding
`<PackageReference Include="Grpc.Net.Client" Version="2.43.0" />` to the
`<PackageReference Include="Grpc.Net.Client" Version="2.63.0" />` to the
`.csproj` file.
- On .NET Framework, the `grpc` OTLP exporter protocol is not supported.

Expand Down
100 changes: 57 additions & 43 deletions content/en/docs/zero-code/net/instrumentations.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-geneva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.Geneva
version: 1.9.0-rc.1
version: 1.9.0-rc.2
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-onecollector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2023-03-03
package:
registry: nuget
name: OpenTelemetry.Exporter.OneCollector
version: 1.9.0-rc.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-aspnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AspNetCore
version: 1.8.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-grpcnetclient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.GrpcNetClient
version: 1.8.0-beta.1
version: 1.9.0-beta.1
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Http
version: 1.8.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-sqlclient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.SqlClient
version: 1.8.0-beta.1
version: 1.9.0-beta.1
26 changes: 26 additions & 0 deletions data/registry/tools-browser-extension-for-opentelemetry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# cSpell:ignore firefox autoinstrumentation Autoinjection Brockman
title: Browser Extension for OpenTelemetry
registryType: utilities
language: js
tags:
- js
- browser
- web-ext
- browser-extension
- chrome-extension
- firefox-extension
- safari-extension
- edge-extension
- autoinstrumentation
urls:
repo: https://github.com/tbrockman/browser-extension-for-opentelemetry
docs: https://github.com/tbrockman/browser-extension-for-opentelemetry?tab=readme-ov-file#browser-extension-for-opentelemetry
license: GPL-3.0
description: |
A highly-configurable browser extension that automatically instruments webpages to emit OpenTelemetry data (while avoiding content-security policy issues!).
Very similar to the archived "OpenTelemetry Browser Extension Autoinjection", but with a few more features and a slightly different approach to content-script injection.
authors:
- name: Theodore Brockman
email: [email protected]
url: https://github.com/tbrockman
createdAt: 2024-06-18
16 changes: 16 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -4679,6 +4679,14 @@
"StatusCode": 200,
"LastSeen": "2024-01-18T20:05:24.591992-05:00"
},
"https://github.com/tbrockman": {
"StatusCode": 200,
"LastSeen": "2024-06-18T16:17:50.672882714Z"
},
"https://github.com/tbrockman/browser-extension-for-opentelemetry": {
"StatusCode": 200,
"LastSeen": "2024-06-18T16:17:47.679619692Z"
},
"https://github.com/tedsuo": {
"StatusCode": 200,
"LastSeen": "2024-01-30T16:04:58.240402-05:00"
Expand Down Expand Up @@ -9439,6 +9447,14 @@
"StatusCode": 200,
"LastSeen": "2024-01-08T12:17:13.880643+01:00"
},
"https://www.nuget.org/packages/Oracle.ManagedDataAccess": {
"StatusCode": 200,
"LastSeen": "2024-06-18T12:21:47.484668425Z"
},
"https://www.nuget.org/packages/Oracle.ManagedDataAccess.Core": {
"StatusCode": 200,
"LastSeen": "2024-06-18T12:21:45.893563793Z"
},
"https://www.nuget.org/packages/Purview.Telemetry.SourceGenerator": {
"StatusCode": 200,
"LastSeen": "2024-04-26T09:57:50.691575342+01:00"
Expand Down

0 comments on commit e5f42ff

Please sign in to comment.