Skip to content

Commit

Permalink
Merge branch 'main' into extra-labels-for-service-graphs
Browse files Browse the repository at this point in the history
  • Loading branch information
t00mas authored May 24, 2024
2 parents a6e46e7 + c7054f8 commit faef5c7
Show file tree
Hide file tree
Showing 542 changed files with 17,128 additions and 17,088 deletions.
27 changes: 27 additions & 0 deletions .chloggen/awss3receiver_obsreport.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: awss3receiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Uses obsreport to report metrics for the AWS S3 Receiver.

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

# (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/feat_support_azure_tags.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: processor/resourcedetectionprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add support for Azure tags in ResourceDetectionProcessor.

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

# (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]
114 changes: 57 additions & 57 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.101.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.101.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.101.0
go.opentelemetry.io/collector/config/configtls v0.101.0
go.opentelemetry.io/collector/otelcol v0.101.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0
go.opentelemetry.io/collector/component v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/config/configtls v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240523155058-812210ba3685
go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.1-0.20240523155058-812210ba3685
go.uber.org/goleak v1.3.0
golang.org/x/mod v0.17.0
golang.org/x/text v0.15.0
Expand Down Expand Up @@ -169,8 +169,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.101.0 // indirect
github.com/samber/lo v1.38.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
go.opentelemetry.io/collector/exporter v0.101.0 // indirect
go.opentelemetry.io/collector/receiver v0.101.0 // indirect
go.opentelemetry.io/collector/exporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/receiver v0.101.1-0.20240523155058-812210ba3685 // indirect
)

require (
Expand Down Expand Up @@ -431,7 +431,7 @@ require (
github.com/grafana/loki/pkg/push v0.0.0-20240514112848-a1b1eeb09583 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hashicorp/consul/api v1.28.3 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
Expand All @@ -454,7 +454,6 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/influxdata/influxdb-observability/common v0.5.8 // indirect
github.com/influxdata/influxdb-observability/influx2otel v0.5.8 // indirect
github.com/influxdata/influxdb-observability/otel2influx v0.5.8 // indirect
Expand Down Expand Up @@ -487,6 +486,7 @@ require (
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/leodido/go-syslog/v4 v4.1.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
github.com/leoluk/perflib_exporter v0.2.1 // indirect
github.com/lestrrat-go/strftime v1.0.6 // indirect
Expand Down Expand Up @@ -685,61 +685,61 @@ require (
go.mongodb.org/atlas v0.36.0 // indirect
go.mongodb.org/mongo-driver v1.15.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.101.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.101.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.8.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.101.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.101.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.101.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.8.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.101.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect
go.opentelemetry.io/collector/config/internal v0.101.0 // indirect
go.opentelemetry.io/collector/confmap v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.0 // indirect
go.opentelemetry.io/collector/connector v0.101.0 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.101.0 // indirect
go.opentelemetry.io/collector/consumer v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.101.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.0 // indirect
go.opentelemetry.io/collector/extension v0.101.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.101.0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.101.0 // indirect
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
go.opentelemetry.io/collector/filter v0.101.0 // indirect
go.opentelemetry.io/collector/pdata v1.8.0 // indirect
go.opentelemetry.io/collector/processor v0.101.0 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.101.0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.0 // indirect
go.opentelemetry.io/collector/semconv v0.101.0 // indirect
go.opentelemetry.io/collector/service v0.101.0 // indirect
go.opentelemetry.io/collector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configauth v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configcompression v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/confighttp v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/confignet v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configopaque v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/config/configretry v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/config/internal v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/connector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/consumer v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/auth v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/featuregate v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/filter v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/pdata v1.8.1-0.20240523143024-6f5d43f9e405 // indirect
go.opentelemetry.io/collector/processor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/semconv v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/collector/service v0.101.1-0.20240523155058-812210ba3685 // indirect
go.opentelemetry.io/contrib/config v0.6.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.26.0 // indirect
go.opentelemetry.io/contrib/zpages v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.26.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.0 // indirect
Expand All @@ -758,9 +758,9 @@ require (
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/api v0.181.0 // indirect
google.golang.org/genproto v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto v0.0.0-20240521202816-d264139d666e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading

0 comments on commit faef5c7

Please sign in to comment.