Skip to content

Commit 643fb8c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feat/oracledb-session-jvm-os
# Conflicts: # receiver/oracledbreceiver/documentation.md # receiver/oracledbreceiver/internal/metadata/config.schema.yaml # receiver/oracledbreceiver/internal/metadata/generated_config.go # receiver/oracledbreceiver/internal/metadata/generated_config_test.go # receiver/oracledbreceiver/internal/metadata/generated_metrics.go # receiver/oracledbreceiver/internal/metadata/generated_metrics_test.go # receiver/oracledbreceiver/internal/metadata/testdata/config.yaml # receiver/oracledbreceiver/metadata.yaml # receiver/oracledbreceiver/scraper.go # receiver/oracledbreceiver/scraper_test.go
2 parents cd2fb03 + 0e88dc0 commit 643fb8c

1,331 files changed

Lines changed: 56940 additions & 40389 deletions

File tree

Some content is hidden

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

.chloggen/27404-filelog-indexed-fingerprint-matching.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.chloggen/40989-azuremonitor-custom-namespace-discovery.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.chloggen/45338-add-azure-blob-compression-support.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.chloggen/fix-statsd-uds-socket-cleanup.yaml renamed to .chloggen/46275.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7-
component: receiver/statsd
7+
component: processor/resource_detection
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Clean up stale unix socket file on startup to prevent "address already in use" errors after unclean shutdown.
10+
note: "Fix Docker resource detection failing to start when optional resource attributes are disabled, including container attributes when the hostname does not match a Docker container name."
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [44866]
13+
issues: [46275]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/47492-kafkaexporter-max-broker-write-bytes.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.chloggen/47581-logdedup-metadata-keys.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.chloggen/47740-httpcheck-dedup-tls-cert-remaining.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.chloggen/48189-schemaprocessor-v2-support.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.chloggen/48365.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.chloggen/48775-pmetricassert-normalize-no-validation.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)