Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
cxdy authored Aug 27, 2024
2 parents e102f2a + 3099e8e commit 0ded0b0
Show file tree
Hide file tree
Showing 605 changed files with 12,916 additions and 12,171 deletions.
27 changes: 27 additions & 0 deletions .chloggen/bug_unique-policy-name-tail-sampling-processor.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: tailsamplingprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Update the `policy` value in metrics dimension value to be unique across multiple tail sampling components with the same policy name."

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

# (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: "This change ensures that the `policy` value in the metrics exported by the tail sampling processor is unique across multiple tail sampling processors with the same policy name."

# 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/firehose_authn.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: awsfirehosereceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix validation of requests with empty access key

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

# (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]
30 changes: 30 additions & 0 deletions .chloggen/fix_prometheus_recceiver_honor_labels.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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: prometheusreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Group scraped metrics into resources created from `job` and `instance` label pairs

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

# (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: |
The receiver will now create a resource for each distinct job/instance label combination.
In addition to the label/instance pairs detected from the scraped metrics, a resource representing the overall
scrape configuration will be created. This additional resource will contain the scrape metrics, such as the number of scraped metrics, the scrape duration, etc.
# 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]
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/google/go-github/v63 v63.0.0
go.opentelemetry.io/collector/confmap v0.107.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/confmap v0.107.1-0.20240827012220-5963d446ca4a
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240827012220-5963d446ca4a
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.13.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/config/configtls v1.13.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/semconv v0.107.1-0.20240821120936-6764622672bc
go.opentelemetry.io/collector/config/configopaque v1.13.1-0.20240827012220-5963d446ca4a
go.opentelemetry.io/collector/config/configtls v1.13.1-0.20240827012220-5963d446ca4a
go.opentelemetry.io/collector/semconv v0.107.1-0.20240827012220-5963d446ca4a
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.24.0
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dist:
otelcol_version: 0.107.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.107.0
Expand Down Expand Up @@ -53,10 +53,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.107.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.107.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.107.0
Expand All @@ -129,8 +129,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.107.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.107.0
Expand Down Expand Up @@ -221,7 +221,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.107.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.107.0
Expand All @@ -234,11 +234,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.1-0.20240821120936-6764622672bc
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.1-0.20240827012220-5963d446ca4a
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.1-0.20240827012220-5963d446ca4a
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.107.0

Expand Down
Loading

0 comments on commit 0ded0b0

Please sign in to comment.