Skip to content

Commit

Permalink
Merge branch 'main' into tsp-batch-debug-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
portertech authored Jan 7, 2025
2 parents 9377a66 + 5a3c58f commit da466cc
Show file tree
Hide file tree
Showing 867 changed files with 24,197 additions and 18,672 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-sha256-regex-for-docker.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: 'internal/docker'

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix image matching regular expression to properly match SHA256 strings.

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

# (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 affects the `docker_observer` extension.

# 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/remove-jaeger-dbmodel-dependency.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: logzioexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove jaeger dbmodel dependency.

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

# (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/tailsamplingprocessor_hot-policy-loading.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: tailsamplingprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Support hot sampling policy loading

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

# (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]
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ exporter/azuremonitorexporter/ @open-telemetry/collector-cont
exporter/carbonexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
exporter/cassandraexporter/ @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac
exporter/clickhouseexporter/ @open-telemetry/collector-contrib-approvers @hanjm @dmitryax @Frapschen @SpencerTorres
exporter/coralogixexporter/ @open-telemetry/collector-contrib-approvers @povilasv @matej-g
exporter/coralogixexporter/ @open-telemetry/collector-contrib-approvers @povilasv
exporter/datadogexporter/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd
exporter/datasetexporter/ @open-telemetry/collector-contrib-approvers @atoulme @martin-majlis-s1 @zdaratom-s1 @tomaz-s1
exporter/dorisexporter/ @open-telemetry/collector-contrib-approvers @atoulme @joker-star-l
Expand Down
8 changes: 6 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/v67 v67.0.0
go.opentelemetry.io/collector/confmap v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -20,3 +20,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)

replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250107062214-ced38e8af2ae

replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae
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.

18 changes: 11 additions & 7 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ require (
github.com/knadh/koanf/v2 v2.1.2
github.com/open-telemetry/opamp-go v0.17.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/config/configtls v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/confmap v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/semconv v0.116.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/config/configtls v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.1-0.20250107062214-ced38e8af2ae
go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.28.0
google.golang.org/protobuf v1.36.1
google.golang.org/protobuf v1.36.2
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -37,3 +37,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
go.uber.org/multierr v1.11.0 // indirect
)

replace go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 => go.opentelemetry.io/collector/scraper/scraperhelper v0.0.0-20250107062214-ced38e8af2ae

replace go.opentelemetry.io/collector/extension/xextension v0.116.0 => go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae
28 changes: 14 additions & 14 deletions cmd/opampsupervisor/go.sum

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

Loading

0 comments on commit da466cc

Please sign in to comment.