Skip to content

Commit 41e6fdc

Browse files
committed
Rebase with TA manifest
Signed-off-by: Yuri Sa <[email protected]>
2 parents 7d21e6b + c6734e2 commit 41e6fdc

File tree

73 files changed

+2506
-1023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2506
-1023
lines changed

.chainsaw.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ spec:
1010
cleanup: 5m0s
1111
delete: 5m0s
1212
error: 5m0s
13-
apply: 10s
13+
apply: 15s
14+
exec: 15s

.chloggen/TEMPLATE.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
22
change_type:
33

4-
# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
55
component:
66

77
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: breaking
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
5+
component: operator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: change dotnet instrumentation feature gate into command line flag --enable-dotnet-instrumentation
9+
10+
# One or more tracking issues related to the change
11+
issues: [2582, 2671]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: 'bug_fix'
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
5+
component: target allocator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: "Fix per-node target allocation for targets from endpointslices"
9+
10+
# One or more tracking issues related to the change
11+
issues: [2718]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext: "The per-node target allocation strategy was not matching endpointslice entries for with a `kind` of Node, such as those for the kubelet metrics created by the prometheus operator"

.github/ISSUE_TEMPLATE/bug_report.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ body:
1616
multiple: true
1717
options:
1818
- collector
19-
- instrumentation
19+
- auto-instrumentation
2020
- target allocator
21-
- opamp bridge
21+
- opamp
2222
- type: textarea
2323
attributes:
2424
label: What happened?

.github/ISSUE_TEMPLATE/feature_request.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ body:
1010
multiple: true
1111
options:
1212
- collector
13-
- instrumentation
13+
- auto-instrumentation
1414
- target allocator
15-
- opamp bridge
15+
- opamp
1616
- type: textarea
1717
attributes:
1818
label: Is your feature request related to a problem? Please describe.

.github/ISSUE_TEMPLATE/other.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ body:
1010
multiple: true
1111
options:
1212
- collector
13-
- instrumentation
13+
- auto-instrumentation
1414
- target allocator
15-
- opamp bridge
15+
- opamp
1616
- type: textarea
1717
attributes:
1818
label: Describe the issue you're reporting

CHANGELOG.md

+106-105
Large diffs are not rendered by default.

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,11 @@ chlog-insert-components:
502502
@echo "" >>components.md
503503
@echo "* [OpenTelemetry Collector - v${OTELCOL_VERSION}](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v${OTELCOL_VERSION})" >>components.md
504504
@echo "* [OpenTelemetry Contrib - v${OTELCOL_VERSION}](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v${OTELCOL_VERSION})" >>components.md
505-
@echo "* [Java auto-instrumentation - ${AUTO_INSTRUMENTATION_JAVA_VERSION}](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v${AUTO_INSTRUMENTATION_JAVA_VERSION})" >>components.md
506-
@echo "* [.NET auto-instrumentation - ${AUTO_INSTRUMENTATION_DOTNET_VERSION}](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/${AUTO_INSTRUMENTATION_DOTNET_VERSION})" >>components.md
507-
@echo "* [Node.JS - ${AUTO_INSTRUMENTATION_NODEJS_VERSION}](https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/auto-instrumentations-node-${AUTO_INSTRUMENTATION_NODEJS_VERSION})" >>components.md
508-
@echo "* [Python - ${AUTO_INSTRUMENTATION_PYTHON_VERSION}](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${AUTO_INSTRUMENTATION_PYTHON_VERSION})" >>components.md
509-
@echo "* [Go - v${AUTO_INSTRUMENTATION_GO_VERSION}](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v${AUTO_INSTRUMENTATION_GO_VERSION})" >>components.md
505+
@echo "* [Java auto-instrumentation - v${AUTO_INSTRUMENTATION_JAVA_VERSION}](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v${AUTO_INSTRUMENTATION_JAVA_VERSION})" >>components.md
506+
@echo "* [.NET auto-instrumentation - v${AUTO_INSTRUMENTATION_DOTNET_VERSION}](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/$v{AUTO_INSTRUMENTATION_DOTNET_VERSION})" >>components.md
507+
@echo "* [Node.JS - v${AUTO_INSTRUMENTATION_NODEJS_VERSION}](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv${AUTO_INSTRUMENTATION_NODEJS_VERSION})" >>components.md
508+
@echo "* [Python - v${AUTO_INSTRUMENTATION_PYTHON_VERSION}](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${AUTO_INSTRUMENTATION_PYTHON_VERSION})" >>components.md
509+
@echo "* [Go - ${AUTO_INSTRUMENTATION_GO_VERSION}](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/${AUTO_INSTRUMENTATION_GO_VERSION})" >>components.md
510510
@echo "* [ApacheHTTPD - ${AUTO_INSTRUMENTATION_APACHE_HTTPD_VERSION}](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv${AUTO_INSTRUMENTATION_APACHE_HTTPD_VERSION})" >>components.md
511511
@echo "* [Nginx - ${AUTO_INSTRUMENTATION_NGINX_VERSION}](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv${AUTO_INSTRUMENTATION_NGINX_VERSION})" >>components.md
512512
@sed -i '/<!-- next version -->/rcomponents.md' CHANGELOG.md

0 commit comments

Comments
 (0)