Skip to content

Commit ebeff53

Browse files
chalinchalin
authored
Merge branch 'main' into chalin-im-platforms-2025-02-05
2 parents c0176cc + a54407f commit ebeff53

File tree

7 files changed

+147
-48
lines changed

7 files changed

+147
-48
lines changed

‎content/en/docs/collector/internal-telemetry.md

+12
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ configure it to help you
1010
[monitor](#use-internal-telemetry-to-monitor-the-collector) and
1111
[troubleshoot](/docs/collector/troubleshooting/) the Collector.
1212

13+
{{% alert title="Important" color="warning" %}} The Collector uses the
14+
OpenTelemetry SDK
15+
[declarative configuration schema](https://github.com/open-telemetry/opentelemetry-configuration)
16+
for configuring how to export its internal telemetry. This schema is still under
17+
[development](/docs/specs/otel/document-status/#lifecycle-status) and may
18+
undergo **breaking changes** in future releases. We intend to keep supporting
19+
older schemas until a 1.0 schema release is available, and offer a transition
20+
period for users to update their configurations before dropping pre-1.0 schemas.
21+
For details and to track progress see
22+
[issue #10808](https://github.com/open-telemetry/opentelemetry-collector/issues/10808).
23+
{{% /alert %}}
24+
1325
## Activate internal telemetry in the Collector
1426

1527
By default, the Collector exposes its own telemetry in two ways:

‎content/en/docs/zero-code/net/_index.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ CI tests run against the following operating systems:
3939
- [Alpine ARM64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/alpine.dockerfile)
4040
- [Debian x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/debian.dockerfile)
4141
- [Debian ARM64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/debian-arm64.dockerfile)
42-
- [CentOS 7 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.9.0/docker/centos-build.dockerfile)
43-
(.NET 8 is not supported)
44-
- [macOS Monterey 12 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md)
42+
- [CentOS Stream 9 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-stream9.dockerfile)
43+
- [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md)
4544
- [Microsoft Windows Server 2022 x64](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md)
4645
- [Ubuntu 20.04 LTS x64](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md)
4746
- Ubuntu 22.04 LTS ARM64

‎content/en/docs/zero-code/net/instrumentations.md

+53-41
Large diffs are not rendered by default.

‎data/community/members.yaml

+13-3
Original file line numberDiff line numberDiff line change
@@ -1886,6 +1886,11 @@ triagers:
18861886
- java-contrib-triagers
18871887
html_url: https://github.com/dehaansa
18881888
avatar_url: https://avatars.githubusercontent.com/u/563558?v=4
1889+
- name: facostaembrace
1890+
teams:
1891+
- javascript-contrib-triagers
1892+
html_url: https://github.com/facostaembrace
1893+
avatar_url: https://avatars.githubusercontent.com/u/108752213?v=4
18891894
- name: Frapschen
18901895
teams:
18911896
- collector-contrib-triagers
@@ -1921,6 +1926,11 @@ triagers:
19211926
- java-instrumentation-triagers
19221927
html_url: https://github.com/JonasKunz
19231928
avatar_url: https://avatars.githubusercontent.com/u/6066661?v=4
1929+
- name: jpmunz
1930+
teams:
1931+
- javascript-contrib-triagers
1932+
html_url: https://github.com/jpmunz
1933+
avatar_url: https://avatars.githubusercontent.com/u/322136?v=4
19241934
- name: kenfinnigan
19251935
teams:
19261936
- java-contrib-triagers
@@ -2134,9 +2144,6 @@ members:
21342144
- name: emreyalvac
21352145
html_url: https://github.com/emreyalvac
21362146
avatar_url: https://avatars.githubusercontent.com/u/25641149?v=4
2137-
- name: facostaembrace
2138-
html_url: https://github.com/facostaembrace
2139-
avatar_url: https://avatars.githubusercontent.com/u/108752213?v=4
21402147
- name: federicobond
21412148
html_url: https://github.com/federicobond
21422149
avatar_url: https://avatars.githubusercontent.com/u/138426?v=4
@@ -2350,6 +2357,9 @@ members:
23502357
- name: ppittle
23512358
html_url: https://github.com/ppittle
23522359
avatar_url: https://avatars.githubusercontent.com/u/1190907?v=4
2360+
- name: pragmaticivan
2361+
html_url: https://github.com/pragmaticivan
2362+
avatar_url: https://avatars.githubusercontent.com/u/301291?v=4
23532363
- name: raphael-theriault-swi
23542364
html_url: https://github.com/raphael-theriault-swi
23552365
avatar_url: https://avatars.githubusercontent.com/u/113933910?v=4

‎data/ecosystem/vendors.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
contact:
2929
oss: false
3030
commercial: true
31+
- name: OpenSearch
32+
nativeOTLP: true
33+
url: https://github.com/opensearch-project/OpenSearch
34+
contact: [email protected]
35+
oss: true
36+
commercial: false
3137
- name: Axiom
3238
nativeOTLP: true
3339
url: https://axiom.co/docs/send-data/opentelemetry

‎data/registry/instrumentation-ruby-all.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ createdAt: 2020-11-09
1414
package:
1515
registry: gems
1616
name: opentelemetry-instrumentation-all
17-
version: 0.73.0
17+
version: 0.73.1
1818
isFirstParty: false

‎static/refcache.json

+60
Original file line numberDiff line numberDiff line change
@@ -2727,6 +2727,10 @@
27272727
"StatusCode": 206,
27282728
"LastSeen": "2025-01-16T11:37:41.194349-05:00"
27292729
},
2730+
"https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md": {
2731+
"StatusCode": 206,
2732+
"LastSeen": "2025-02-05T14:08:07.215377044Z"
2733+
},
27302734
"https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md": {
27312735
"StatusCode": 206,
27322736
"LastSeen": "2025-01-16T11:37:43.147843-05:00"
@@ -4203,6 +4207,10 @@
42034207
"StatusCode": 200,
42044208
"LastSeen": "2024-08-15T15:44:17.548487+02:00"
42054209
},
4210+
"https://github.com/jpmunz": {
4211+
"StatusCode": 206,
4212+
"LastSeen": "2025-02-06T08:03:38.388295215Z"
4213+
},
42064214
"https://github.com/jsirianni": {
42074215
"StatusCode": 206,
42084216
"LastSeen": "2025-02-02T10:27:20.573536-05:00"
@@ -6387,6 +6395,10 @@
63876395
"StatusCode": 206,
63886396
"LastSeen": "2025-02-01T07:12:43.673402-05:00"
63896397
},
6398+
"https://github.com/open-telemetry/opentelemetry-collector/issues/10808": {
6399+
"StatusCode": 206,
6400+
"LastSeen": "2025-02-05T17:17:50.215922389Z"
6401+
},
63906402
"https://github.com/open-telemetry/opentelemetry-collector/issues/6151": {
63916403
"StatusCode": 206,
63926404
"LastSeen": "2025-02-01T07:12:51.032442-05:00"
@@ -6715,14 +6727,26 @@
67156727
"StatusCode": 206,
67166728
"LastSeen": "2025-01-13T11:43:26.44481-05:00"
67176729
},
6730+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNet-1.11.0-beta.1/src/OpenTelemetry.Instrumentation.AspNet/README.md#list-of-metrics-produced": {
6731+
"StatusCode": 206,
6732+
"LastSeen": "2025-02-05T14:08:18.160312597Z"
6733+
},
67186734
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNet-1.9.0-beta.1/src/OpenTelemetry.Instrumentation.AspNet/README.md#list-of-metrics-produced": {
67196735
"StatusCode": 206,
67206736
"LastSeen": "2025-01-16T11:37:40.110043-05:00"
67216737
},
6738+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNetCore-1.11.0/src/OpenTelemetry.Instrumentation.AspNetCore/README.md#list-of-metrics-produced": {
6739+
"StatusCode": 206,
6740+
"LastSeen": "2025-02-05T14:08:20.886021593Z"
6741+
},
67226742
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNetCore-1.9.0/src/OpenTelemetry.Instrumentation.AspNetCore/README.md#list-of-metrics-produced": {
67236743
"StatusCode": 206,
67246744
"LastSeen": "2025-01-16T11:37:40.774765-05:00"
67256745
},
6746+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Http-1.11.0/src/OpenTelemetry.Instrumentation.Http/README.md#list-of-metrics-produced": {
6747+
"StatusCode": 206,
6748+
"LastSeen": "2025-02-05T14:08:23.674031491Z"
6749+
},
67266750
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Http-1.9.0/src/OpenTelemetry.Instrumentation.Http/README.md#list-of-metrics-produced": {
67276751
"StatusCode": 206,
67286752
"LastSeen": "2025-01-16T11:37:41.452403-05:00"
@@ -6731,6 +6755,14 @@
67316755
"StatusCode": 206,
67326756
"LastSeen": "2025-01-16T11:37:43.820937-05:00"
67336757
},
6758+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Process-1.11.0-beta.1/src/OpenTelemetry.Instrumentation.Process/README.md#metrics": {
6759+
"StatusCode": 206,
6760+
"LastSeen": "2025-02-05T14:08:29.95647893Z"
6761+
},
6762+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Runtime-1.11.0/src/OpenTelemetry.Instrumentation.Runtime/README.md#metrics": {
6763+
"StatusCode": 206,
6764+
"LastSeen": "2025-02-05T14:08:30.301088829Z"
6765+
},
67346766
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Runtime-1.9.0/src/OpenTelemetry.Instrumentation.Runtime/README.md#metrics": {
67356767
"StatusCode": 206,
67366768
"LastSeen": "2025-01-16T11:37:42.260803-05:00"
@@ -6759,6 +6791,10 @@
67596791
"StatusCode": 206,
67606792
"LastSeen": "2025-01-16T11:37:44.55147-05:00"
67616793
},
6794+
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/releases/tag/Instrumentation.SqlClient-1.11.0-beta.1": {
6795+
"StatusCode": 206,
6796+
"LastSeen": "2025-02-05T14:08:36.056979393Z"
6797+
},
67626798
"https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Exporter.Geneva": {
67636799
"StatusCode": 206,
67646800
"LastSeen": "2025-01-16T11:38:11.498677-05:00"
@@ -6883,6 +6919,10 @@
68836919
"StatusCode": 206,
68846920
"LastSeen": "2025-01-17T16:27:40.257146-05:00"
68856921
},
6922+
"https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-stream9.dockerfile": {
6923+
"StatusCode": 206,
6924+
"LastSeen": "2025-02-05T14:08:05.334489462Z"
6925+
},
68866926
"https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/debian-arm64.dockerfile": {
68876927
"StatusCode": 206,
68886928
"LastSeen": "2025-01-17T16:27:44.073405-05:00"
@@ -11395,6 +11435,10 @@
1139511435
"StatusCode": 206,
1139611436
"LastSeen": "2025-02-01T07:10:29.238657-05:00"
1139711437
},
11438+
"https://github.com/opensearch-project/OpenSearch": {
11439+
"StatusCode": 206,
11440+
"LastSeen": "2025-02-06T01:27:14.955293169Z"
11441+
},
1139811442
"https://github.com/opentelemetrybot": {
1139911443
"StatusCode": 206,
1140011444
"LastSeen": "2024-12-12T12:41:24.59683+01:00"
@@ -11587,6 +11631,10 @@
1158711631
"StatusCode": 206,
1158811632
"LastSeen": "2025-02-02T10:27:26.137563-05:00"
1158911633
},
11634+
"https://github.com/pragmaticivan": {
11635+
"StatusCode": 206,
11636+
"LastSeen": "2025-02-06T08:03:45.864720721Z"
11637+
},
1159011638
"https://github.com/pragmaticivan/nestjs-otel": {
1159111639
"StatusCode": 206,
1159211640
"LastSeen": "2025-01-07T10:33:07.125592-05:00"
@@ -17539,6 +17587,10 @@
1753917587
"StatusCode": 200,
1754017588
"LastSeen": "2025-01-30T16:48:49.019242-05:00"
1754117589
},
17590+
"https://www.nuget.org/packages/MongoDB.Driver": {
17591+
"StatusCode": 200,
17592+
"LastSeen": "2025-02-05T14:08:11.405763332Z"
17593+
},
1754217594
"https://www.nuget.org/packages/MongoDB.Driver.Core": {
1754317595
"StatusCode": 200,
1754417596
"LastSeen": "2025-01-30T16:48:33.040546-05:00"
@@ -17739,10 +17791,18 @@
1773917791
"StatusCode": 200,
1774017792
"LastSeen": "2025-01-30T16:48:44.810975-05:00"
1774117793
},
17794+
"https://www.nuget.org/packages/System.Data.SqlClient/4.9.0#readme-body-tab": {
17795+
"StatusCode": 200,
17796+
"LastSeen": "2025-02-05T14:08:15.669112013Z"
17797+
},
1774217798
"https://www.nuget.org/packages/ThrottlingTroll": {
1774317799
"StatusCode": 200,
1774417800
"LastSeen": "2024-11-02T22:34:51.466534365Z"
1774517801
},
17802+
"https://www.nuget.org/packages/log4net": {
17803+
"StatusCode": 200,
17804+
"LastSeen": "2025-02-05T14:08:38.950154705Z"
17805+
},
1774617806
"https://www.nuget.org/profiles/OpenTelemetry": {
1774717807
"StatusCode": 200,
1774817808
"LastSeen": "2025-01-30T16:59:52.196935-05:00"

0 commit comments

Comments
 (0)