Skip to content

Commit

Permalink
Merge branch 'main' into googlecloudmonitoringreceiver-phase1
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishek-at-cloudwerx authored Aug 9, 2024
2 parents 3431c72 + 46a9f94 commit 25b9dc2
Show file tree
Hide file tree
Showing 563 changed files with 13,848 additions and 14,538 deletions.
27 changes: 27 additions & 0 deletions .chloggen/codeboten_update-scope-filestatsreceiver.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: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: filestatsreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Update the scope name for telemetry produced by the filestatsreceiver from `otelcol/filestatsreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver`"

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

# (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: []
27 changes: 27 additions & 0 deletions .chloggen/logdedup-alpha.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: logdedupprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Updates stability level to alpha.

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

# (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: []
27 changes: 27 additions & 0 deletions .chloggen/ottl_md5_function.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: pkg/ottl

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add the `MD5` function to convert the `value` into a MD5 hash/digest"

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

# (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]
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/v63 v63.0.0
go.opentelemetry.io/collector/confmap v0.106.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
go.opentelemetry.io/collector/confmap v0.106.2-0.20240809151205-7638bb298172
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240809151205-7638bb298172
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.12.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect
go.opentelemetry.io/collector/featuregate v1.12.1-0.20240809151205-7638bb298172 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240809151205-7638bb298172 // 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.12.0
go.opentelemetry.io/collector/config/configtls v1.12.0
go.opentelemetry.io/collector/semconv v0.106.1
go.opentelemetry.io/collector/config/configopaque v1.12.1-0.20240809151205-7638bb298172
go.opentelemetry.io/collector/config/configtls v1.12.1-0.20240809151205-7638bb298172
go.opentelemetry.io/collector/semconv v0.106.2-0.20240809151205-7638bb298172
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.

32 changes: 16 additions & 16 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dist:
otelcol_version: 0.106.1

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.106.1
Expand Down Expand Up @@ -54,10 +54,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.106.1
Expand Down Expand Up @@ -104,8 +104,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.106.1

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.106.1
Expand All @@ -128,8 +128,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.106.1

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.106.1
Expand Down Expand Up @@ -220,7 +220,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.106.1

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.106.1
Expand All @@ -233,11 +233,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.106.1

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.2-0.20240809151205-7638bb298172
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.2-0.20240809151205-7638bb298172
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.106.1
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.106.1

Expand Down
Loading

0 comments on commit 25b9dc2

Please sign in to comment.