Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update OTEL dependencies to v0.112.0 #234

Merged
merged 2 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions config/config-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -366,16 +366,35 @@ processors:
# change data type from int64 -> double
- action: toggle_scalar_data_type

# filter to include only raw agent metrics supported by cloud monitoring
filter/agent_0:
metrics:
include:
match_type: strict
metric_names:
- otelcol_process_uptime
- otelcol_process_memory_rss
- grpc_client_attempt_duration
- googlecloudmonitoring_point_count

# filter to include only agent metrics supported by cloud monitoring
filter/agent:
filter/agent_1:
metrics:
include:
match_type: strict
metric_names:
- otelcol_process_uptime
- otelcol_process_memory_rss
- otelcol_grpc_io_client_completed_rpcs
- otelcol_googlecloudmonitoring_point_count
- grpc_client_attempt_duration_count
- googlecloudmonitoring_point_count

# create count metric from histogram metric
transform/agent:
error_mode: ignore
metric_statements:
- context: metric
statements:
- extract_count_metric(true) where name == "grpc_client_attempt_duration"

# convert from windows perf counter formats to cloud monitoring formats
metricstransform/iis:
Expand Down Expand Up @@ -428,28 +447,26 @@ processors:
- include: otelcol_process_memory_rss
action: update
new_name: agent/memory_usage
# otelcol_grpc_io_client_completed_rpcs -> agent/api_request_count
- include: otelcol_grpc_io_client_completed_rpcs
# grpc_client_attempt_duration_count -> agent/api_request_count
- include: grpc_client_attempt_duration_count
action: update
new_name: agent/api_request_count
operations:
# change data type from double -> int64
- action: toggle_scalar_data_type
# TODO: below is proposed new configuration for the metrics transform processor
# ignore any non "google.monitoring" RPCs (note there won't be any other RPCs for now)
# - action: select_label_values
# label: grpc_client_method
# value_regexp: ^google\.monitoring
# change label grpc_client_status -> state
# change label grpc_status -> state
- action: update_label
label: grpc_client_status
label: grpc_status
new_label: state
# delete grpc_client_method dimension, retaining only state
- action: aggregate_labels
label_set: [state]
aggregation_type: sum
# otelcol_googlecloudmonitoring_point_count -> agent/monitoring/point_count
- include: otelcol_googlecloudmonitoring_point_count
# googlecloudmonitoring_point_count -> agent/monitoring/point_count
- include: googlecloudmonitoring_point_count
action: update
new_name: agent/monitoring/point_count
operations:
Expand Down Expand Up @@ -518,7 +535,9 @@ service:
receivers:
- prometheus/agent
processors:
- filter/agent
- filter/agent_0
- transform/agent
- filter/agent_1
- metricstransform/agent
- resourcedetection
exporters:
Expand Down
417 changes: 227 additions & 190 deletions go.mod

Large diffs are not rendered by default.

925 changes: 501 additions & 424 deletions go.sum

Large diffs are not rendered by default.

46 changes: 22 additions & 24 deletions internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-collector

go 1.21

toolchain go1.21.10
go 1.22.8

require (
github.com/client9/misspell v0.3.4
github.com/golangci/golangci-lint v1.52.1
github.com/google/addlicense v1.1.1
github.com/google/googet v2.13.0+incompatible
go.opentelemetry.io/collector/cmd/mdatagen v0.100.0
go.opentelemetry.io/collector/cmd/mdatagen v0.112.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
)

Expand Down Expand Up @@ -37,7 +35,7 @@ require (
github.com/breml/bidichk v0.2.4 // indirect
github.com/breml/errchkjson v0.3.1 // indirect
github.com/butuzov/ireturn v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charithe/durationcheck v0.0.10 // indirect
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
github.com/curioswitch/go-reassign v0.2.0 // indirect
Expand All @@ -59,7 +57,7 @@ require (
github.com/go-toolsmith/astp v1.1.0 // indirect
github.com/go-toolsmith/strparse v1.1.0 // indirect
github.com/go-toolsmith/typep v1.1.0 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.8.1 // indirect
Expand All @@ -81,7 +79,7 @@ require (
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -152,7 +150,7 @@ require (
github.com/sourcegraph/go-diff v0.7.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.15.0 // indirect
Expand All @@ -174,27 +172,27 @@ require (
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.2.0 // indirect
gitlab.com/bosi/decorder v0.2.3 // indirect
go.opentelemetry.io/collector/component v0.100.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
go.opentelemetry.io/collector/confmap v0.100.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0 // indirect
go.opentelemetry.io/collector/filter v0.100.0 // indirect
go.opentelemetry.io/collector/pdata v1.7.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/collector/component v0.112.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.112.0 // indirect
go.opentelemetry.io/collector/confmap v1.18.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0 // indirect
go.opentelemetry.io/collector/filter v0.112.0 // indirect
go.opentelemetry.io/collector/pdata v1.18.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.1 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading