Skip to content

Commit

Permalink
Merge branch 'main' into renovate/github.com-samber-lo-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
songy23 authored Jul 16, 2024
2 parents e416495 + ee0e0a1 commit 6f6a3bc
Show file tree
Hide file tree
Showing 525 changed files with 12,035 additions and 11,651 deletions.
22 changes: 22 additions & 0 deletions .chloggen/attribute-from-client-address.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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/resource, processor/attributes

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add an option to extract value from a client address by specifying `client.address` value in the `from_context` field.

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

# 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]
8 changes: 4 additions & 4 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.21.0

require (
github.com/google/go-github/v62 v62.0.0
go.opentelemetry.io/collector/confmap v0.104.1-0.20240716040034-2d7dea6a5a2e
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240716040034-2d7dea6a5a2e
go.opentelemetry.io/collector/confmap v0.105.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.105.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -18,8 +18,8 @@ require (
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
go.opentelemetry.io/collector/featuregate v1.11.1-0.20240716040034-2d7dea6a5a2e // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240715203212-534768cf7a80 // indirect
go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)
16 changes: 8 additions & 8 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.11.1-0.20240716040034-2d7dea6a5a2e
go.opentelemetry.io/collector/config/configtls v0.104.1-0.20240716040034-2d7dea6a5a2e
go.opentelemetry.io/collector/semconv v0.104.1-0.20240716040034-2d7dea6a5a2e
go.opentelemetry.io/collector/config/configopaque v1.12.0
go.opentelemetry.io/collector/config/configtls v1.12.0
go.opentelemetry.io/collector/semconv v0.105.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
google.golang.org/protobuf v1.34.2
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.

Loading

0 comments on commit 6f6a3bc

Please sign in to comment.