Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
sakulali committed Sep 21, 2023
2 parents 7a5decd + 7173641 commit 39f159d
Show file tree
Hide file tree
Showing 500 changed files with 11,953 additions and 9,192 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-xray-metadata-unmarshal.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: awsxrayexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Restore the AWS X-Ray metadata structure when exporting.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23610]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
27 changes: 27 additions & 0 deletions .chloggen/k8sclusterreceiver-fix-units.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: 'k8sclusterreceiver'

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Change k8scluster receiver metric units to follow otel semantic conventions"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [10553]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
27 changes: 27 additions & 0 deletions .chloggen/ottl-truncate-function.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/ottl

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add new `TruncateTime` function to help with manipulation of timestamps

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [26696]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
27 changes: 27 additions & 0 deletions .chloggen/prometheus-receiver-proto-negotiation-option.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: prometheusreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add a new flag, enable_protobuf_negotiation, which enables protobuf negotiation when scraping prometheus clients

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [27027]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
2 changes: 2 additions & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ assigneeGroups:
approvers_maintainers:
# Approvers
- Aneurysm9
- astencel-sumo
- atoulme
- dashpole
- songy23
- fatsheep9146
# Maintainers
- bogdandrutu
Expand Down
75 changes: 38 additions & 37 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.85.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.85.0
go.opentelemetry.io/collector/component v0.85.0
go.opentelemetry.io/collector/config/configtls v0.85.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0
go.opentelemetry.io/collector/component v0.85.1-0.20230919160920-512b9c3c8fec
go.opentelemetry.io/collector/config/configtls v0.85.1-0.20230919160920-512b9c3c8fec
go.opentelemetry.io/collector/otelcol v0.0.0-20230919160920-512b9c3c8fec
go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.1-0.20230919160920-512b9c3c8fec
golang.org/x/mod v0.12.0
golang.org/x/text v0.13.0
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -169,9 +169,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.85.0 // indirect
github.com/samber/lo v1.37.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
go.opentelemetry.io/collector/exporter v0.85.0 // indirect
go.opentelemetry.io/collector/receiver v0.85.0 // indirect
go.opentelemetry.io/collector/exporter v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/receiver v0.85.1-0.20230919160920-512b9c3c8fec // indirect
)

require (
Expand Down Expand Up @@ -462,7 +461,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mongodb-forks/digest v1.0.5 // indirect
github.com/montanaflynn/stats v0.7.0 // indirect
github.com/mostynb/go-grpc-compression v1.2.0 // indirect
github.com/mostynb/go-grpc-compression v1.2.1 // indirect
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down Expand Up @@ -611,45 +610,47 @@ require (
go.mongodb.org/atlas v0.33.0 // indirect
go.mongodb.org/mongo-driver v1.12.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.85.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.85.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.85.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.85.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.85.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.85.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.85.0 // indirect
go.opentelemetry.io/collector/config/internal v0.85.0 // indirect
go.opentelemetry.io/collector/confmap v0.85.0 // indirect
go.opentelemetry.io/collector/connector v0.85.0 // indirect
go.opentelemetry.io/collector/consumer v0.85.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.85.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.0 // indirect
go.opentelemetry.io/collector/extension v0.85.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.85.0 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.85.0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect
go.opentelemetry.io/collector/processor v0.85.0 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.85.0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0 // indirect
go.opentelemetry.io/collector/semconv v0.85.0 // indirect
go.opentelemetry.io/collector v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/configauth v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/configcompression v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/configgrpc v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/confighttp v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/confignet v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/configopaque v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/config/internal v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/confmap v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/connector v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/consumer v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/extension v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/extension/auth v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014.0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014.0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/processor v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/semconv v0.85.1-0.20230919160920-512b9c3c8fec // indirect
go.opentelemetry.io/collector/service v0.0.0-20230915215502-07938f20fcc7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
go.opentelemetry.io/contrib/zpages v0.43.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.19.0 // indirect
go.opentelemetry.io/contrib/zpages v0.44.0 // indirect
go.opentelemetry.io/otel v1.18.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v0.40.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 // indirect
go.opentelemetry.io/otel/metric v1.18.0 // indirect
go.opentelemetry.io/otel/sdk v1.18.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect
Expand Down
Loading

0 comments on commit 39f159d

Please sign in to comment.