Skip to content

Commit a39e4e1

Browse files
committed
Merge branch 'main' into getDimensionValue
Signed-off-by: Jared Tan <[email protected]>
2 parents 9559623 + 5cc0136 commit a39e4e1

File tree

301 files changed

+2625
-2410
lines changed

Some content is hidden

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

301 files changed

+2625
-2410
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: clickhouseexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Upgrade trace SpanKind and StatusCode string values
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [34799]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: |
19+
This change updates the output of the trace SpanKind and StatusCode fields to be consistent
20+
with the specification's enum values. While this change will not break any deployments, it may affect
21+
queries dependent on the old enum names.
22+
23+
For more details on old->new values, see this related PR:
24+
https://github.com/open-telemetry/opentelemetry-collector/pull/6250
25+
26+
27+
# If your change doesn't affect end users or the exported elements of any package,
28+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
29+
# Optional: The change log or logs in which this entry should be included.
30+
# e.g. '[user]' or '[user, api]'
31+
# Include 'user' if the change is relevant to end users.
32+
# Include 'api' if there is a change to a library API.
33+
# Default: '[user]'
34+
change_logs: []
+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: prometheusreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Move the TargetAllocator configuration struct to an internal directory
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [33146]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [api]

.github/CODEOWNERS

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ exporter/sapmexporter/ @open-teleme
8080
exporter/sentryexporter/ @open-telemetry/collector-contrib-approvers @AbhiPrasad
8181
exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
8282
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
83-
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek
83+
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo
8484
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @andrzej-stencel
8585
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
8686
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
@@ -122,7 +122,7 @@ extension/storage/ @open-teleme
122122
extension/storage/dbstorage/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
123123
extension/storage/filestorage/ @open-telemetry/collector-contrib-approvers @djaglowski
124124
extension/storage/redisstorageextension/ @open-telemetry/collector-contrib-approvers @atoulme
125-
extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek
125+
extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo
126126

127127
internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
128128
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
@@ -203,7 +203,7 @@ processor/resourceprocessor/ @open-teleme
203203
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
204204
processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
205205
processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
206-
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek
206+
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo
207207
processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
208208
processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
209209

cmd/otelcontribcol/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -794,22 +794,22 @@ require (
794794
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
795795
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
796796
go.opentelemetry.io/contrib/zpages v0.53.0 // indirect
797-
go.opentelemetry.io/otel v1.28.0 // indirect
797+
go.opentelemetry.io/otel v1.29.0 // indirect
798798
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
799799
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
800800
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
801801
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
802802
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
803803
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
804804
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
805-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
805+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 // indirect
806806
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
807807
go.opentelemetry.io/otel/log v0.4.0 // indirect
808-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
809-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
808+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
809+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
810810
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
811-
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
812-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
811+
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
812+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
813813
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
814814
go.uber.org/atomic v1.11.0 // indirect
815815
go.uber.org/dig v1.17.1 // indirect

cmd/otelcontribcol/go.sum

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/oteltestbedcol/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ require (
260260
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
261261
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
262262
go.opentelemetry.io/contrib/zpages v0.53.0 // indirect
263-
go.opentelemetry.io/otel v1.28.0 // indirect
263+
go.opentelemetry.io/otel v1.29.0 // indirect
264264
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
265265
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
266266
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
@@ -271,11 +271,11 @@ require (
271271
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
272272
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
273273
go.opentelemetry.io/otel/log v0.4.0 // indirect
274-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
275-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
274+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
275+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
276276
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
277-
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
278-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
277+
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
278+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
279279
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
280280
go.uber.org/atomic v1.11.0 // indirect
281281
go.uber.org/multierr v1.11.0 // indirect

cmd/oteltestbedcol/go.sum

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)