Skip to content

Commit

Permalink
Merge branch 'main' into transform-fix-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerHelmuth authored Apr 16, 2024
2 parents 0ce68e9 + f8525da commit 7c66e41
Show file tree
Hide file tree
Showing 900 changed files with 15,653 additions and 10,351 deletions.
27 changes: 27 additions & 0 deletions .chloggen/span-metric-exemplar-memory-leak.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: spanmetrics

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Discard counter span metric exemplars after each flush interval to avoid unbounded memory growth

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

# (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 aligns exemplar discarding for counter span metrics with the existing logic for histogram span metrics

# 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]
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ processor/k8sattributesprocessor/ @open-telemetry/collect
processor/logstransformprocessor/ @open-telemetry/collector-contrib-approvers @djaglowski @dehaansa
processor/metricsgenerationprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9
processor/metricstransformprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @jmacd
processor/redactionprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @mx-psi @TylerHelmuth
processor/remotetapprocessor/ @open-telemetry/collector-contrib-approvers @atoulme
processor/resourcedetectionprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ on:
- 'releases/**'
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
paths-ignore:
- '**/README.md'
merge_group:
pull_request:
types: [opened, synchronize, reopened, labeled, unlabeled]
branches:
- main
paths-ignore:
- '**/README.md'
env:
TEST_RESULTS: testbed/tests/results/junit/results.xml
# Make sure to exit early if cache segment download times out after 2 minutes.
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./
- `receiver/dockerstats`: Remove stable receiver.dockerstats.useScraperV2 feature gate. (#31999)
- `awsxrayexporter`: change x-ray exporter's translator to make "." split annotation pass as-is (#31732)
In the past, X-Ray doesn’t support “.”. So we have a translator in x-ray export to translates it to “_” before sending traces to X-Ray Service. | To match otel naming style, x-ray service team decide to change their service to support both "." type and "" type of naming. In this case the translator that translate "." to "" is no-longer needed. This PR change the way this translator work | X-Ray PMs agree on rolling out this change by using feature-gate
- `oracledbreceiver`: Fix incorrect values being set for oracledb.tablespace_size.limit and oracledb.tablespace_size.usage (#31451)
Please grant the `DBA_TABLESPACE_USAGE_METRICS` permission to the user connecting to the Oracle DB instance to ensure all enabled
metrics are properly ingested.

### 🚩 Deprecations 🚩

Expand Down Expand Up @@ -85,7 +88,6 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./
- `jmxreceiver`: Fix memory leak during component shutdown (#32289)
- `k8sobjectsreceiver`: Fix memory leak caused by the pull mode's interval ticker (#31919)
- `kafkareceiver`: fix kafka receiver panic on shutdown (#31926)
- `oracledbreceiver`: Fix incorrect values being set for oracledb.tablespace_size.limit and oracledb.tablespace_size.usage (#31451)
- `prometheusreceiver`: Fix a bug where a new prometheus receiver with the same name cannot be created after the previous receiver is Shutdown (#32123)
- `resourcedetectionprocessor`: Only attempt to detect Kubernetes node resource attributes when they're enabled. (#31941)
- `syslogreceiver`: Fix issue where static resource and attributes were ignored (#31849)
Expand Down
85 changes: 43 additions & 42 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.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.98.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.98.1-0.20240416135553-49cc9e05e3a9
go.opentelemetry.io/collector/config/configtls v0.98.1-0.20240416135553-49cc9e05e3a9
go.opentelemetry.io/collector/otelcol v0.98.1-0.20240416135553-49cc9e05e3a9
go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.1-0.20240416135553-49cc9e05e3a9
go.opentelemetry.io/collector/component v0.98.1-0.20240416174005-d0f15e2463f8
go.opentelemetry.io/collector/config/configtls v0.98.1-0.20240416174005-d0f15e2463f8
go.opentelemetry.io/collector/otelcol v0.98.1-0.20240416174005-d0f15e2463f8
go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.1-0.20240416174005-d0f15e2463f8
go.uber.org/goleak v1.3.0
golang.org/x/mod v0.17.0
golang.org/x/text v0.14.0
Expand Down Expand Up @@ -169,8 +169,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.98.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.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/receiver v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/exporter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/receiver v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
)

require (
Expand Down Expand Up @@ -258,7 +258,7 @@ require (
github.com/apache/thrift v0.20.0 // indirect
github.com/ardielle/ardielle-go v1.5.2 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.51.21 // indirect
github.com/aws/aws-sdk-go v1.51.22 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
Expand Down Expand Up @@ -616,41 +616,42 @@ 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.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configauth v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configcompression v1.5.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/confighttp v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/confignet v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configopaque v1.5.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configretry v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/config/internal v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/connector v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/consumer v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/extension v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/extension/auth v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/featuregate v1.5.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/pdata v1.5.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/processor v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/semconv v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector/service v0.98.1-0.20240416135553-49cc9e05e3a9 // indirect
go.opentelemetry.io/collector v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configauth v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configcompression v1.5.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/confighttp v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/confignet v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configopaque v1.5.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configretry v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/config/internal v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/connector v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/connector/forwardconnector v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/consumer v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/extension v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/extension/auth v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/featuregate v1.5.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/filter v0.0.0-20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/pdata v1.5.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/processor v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/semconv v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/collector/service v0.98.1-0.20240416174005-d0f15e2463f8 // indirect
go.opentelemetry.io/contrib/config v0.5.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
Expand Down
Loading

0 comments on commit 7c66e41

Please sign in to comment.