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

[pull] main from open-telemetry:main #24

Merged
merged 23 commits into from
Aug 11, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 9, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

VihasMakwana and others added 6 commits August 8, 2023 16:13
Description: Add Trie data structure and keep it separate from PR
#23056

Testing: Relevant test cases added

---------

Co-authored-by: Dan Jaglowski <jaglows3@gmail.com>
…eanup (#25097)

**Description:** Changes the behavior of the specific test case to be
more aligned with its behavior pre #25066

**Link to tracking Issue:** #25095
**Description:**
Added a function for extracting the count from a Histogram,
ExponentialHistogram or Summary as an individual metric. The added
function also works for Summaries, so we can later deprecate the
Summary-specific `summary_count_val_to_sum` function.

This is very similar to #24368, which added a function for extracting
the sum in the same fashion. The only significant difference is that
count values are required by the spec. See that PR for implementation
discussion.

**Link to tracking Issue:** #22853 

**Testing:**
Added unit tests both for the function itself and OTTL statements
involving it.

**Documentation:**
Added a section in the README.
…assing Converters as literal parameters (#24356)

**Description:** Add a new Function Getter to the OTTL package, to allow
passing Converters as literal parameters

**Link to tracking Issue:** [<Issue number if
applicable>](#22961)

**Testing:** Added a unit test and also tested the following
configuration

```
replace_pattern(attributes["message"], "device=*", attributes["device_name"], SHA256)
```

A tentative example of how the literal function gets invoked is
```
type ReplacePatternArguments[K any] struct {
	Target       ottl.GetSetter[K]      `ottlarg:"0"`
	RegexPattern string                 `ottlarg:"1"`
	Replacement  ottl.StringGetter[K]   `ottlarg:"2"`
	Function     ottl.FunctionGetter[K] `ottlarg:"3"`
}

func replacePattern[K any](target ottl.GetSetter[K], regexPattern string, replacement ottl.StringGetter[K], fn ottl.Expr[K]) (ottl.ExprFunc[K], error) {
	compiledPattern, err := regexp.Compile(regexPattern)
	if err != nil {
		return nil, fmt.Errorf("the regex pattern supplied to replace_pattern is not a valid pattern: %w", err)
	}
	return func(ctx context.Context, tCtx K) (interface{}, error) {
		originalVal, err := target.Get(ctx, tCtx)
		if err != nil {
			return nil, err
		}
		replacementVal, err := fn.Eval(ctx, tCtx)
		if err != nil {
			return nil, err
		}
          .......
          updatedStr := compiledPattern.ReplaceAllString(originalValStr, replacementValHash.(string))
}
```
@pull pull bot added the ⤵️ pull label Aug 9, 2023
opentelemetrybot and others added 17 commits August 8, 2023 23:23
Bump github.com/Azure/azure-event-hubs-go/v3 from 3.6.0 to 3.6.1 in
/receiver/azureblobreceiver
Bump github.com/Azure/azure-event-hubs-go/v3 from 3.6.0 to 3.6.1 in
/receiver/azureeventhubreceiver
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/exporter/awscloudwatchlogsexporter
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/exporter/awsemfexporter
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/exporter/awsxrayexporter
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/exporter/kafkaexporter
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/extension/observer/ecsobserver
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/awsutil
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/cwlogs
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/k8s
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/proxy
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/xray
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/aws/xray/testdata/sampleapp
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/internal/metadataproviders
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/processor/resourcedetectionprocessor
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/receiver/awscontainerinsightreceiver
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/receiver/awsecscontainermetricsreceiver
Bump github.com/aws/aws-sdk-go from 1.44.316 to 1.44.319 in
/receiver/awsxrayreceiver
Bump github.com/aws/aws-sdk-go-v2 from 1.20.0 to 1.20.1 in
/extension/sigv4authextension
Bump github.com/aws/aws-sdk-go-v2/config from 1.18.32 to 1.18.33 in
/extension/sigv4authextension
Bump github.com/aws/aws-sdk-go-v2/credentials from 1.13.31 to 1.13.32 in
/extension/sigv4authextension
Bump github.com/aws/aws-sdk-go-v2/service/sts from 1.21.1 to 1.21.2 in
/extension/sigv4authextension
Bump github.com/getsentry/sentry-go from 0.22.0 to 0.23.0 in
/exporter/sentryexporter
Bump github.com/hashicorp/consul/api from 1.23.0 to 1.24.0 in
/internal/metadataproviders
Bump github.com/hashicorp/consul/api from 1.23.0 to 1.24.0 in
/processor/resourcedetectionprocessor
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in
/exporter/signalfxexporter
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in
/extension/observer/hostobserver
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in
/receiver/awscontainerinsightreceiver
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in
/receiver/hostmetricsreceiver
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in
/receiver/jmxreceiver
Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 in /testbed
Bump github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
from 1.0.715 to 1.0.717 in /exporter/tencentcloudlogserviceexporter
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /extension/observer/dockerobserver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /internal/coreinternal
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/aerospikereceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/apachereceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/dockerstatsreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/elasticsearchreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/flinkmetricsreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/jmxreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/kafkametricsreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/memcachedreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/mongodbreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/mysqlreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/nginxreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/postgresqlreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/redisreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/sqlqueryreceiver
Bump github.com/testcontainers/testcontainers-go from 0.21.0 to 0.22.0
in /receiver/zookeeperreceiver
Bump github.com/vmware/govmomi from 0.30.6 to 0.30.7 in
/receiver/vcenterreceiver
Bump go.mongodb.org/mongo-driver from 1.12.0 to 1.12.1 in
/receiver/mongodbreceiver
Bump golang.org/x/crypto from 0.11.0 to 0.12.0 in
/receiver/podmanreceiver
Bump golang.org/x/net from 0.12.0 to 0.14.0 in
/exporter/azuremonitorexporter
Bump golang.org/x/net from 0.12.0 to 0.14.0 in /internal/aws/awsutil
Bump golang.org/x/oauth2 from 0.10.0 to 0.11.0 in
/exporter/f5cloudexporter
Bump golang.org/x/oauth2 from 0.10.0 to 0.11.0 in
/extension/oauth2clientauthextension
Bump golang.org/x/sys from 0.10.0 to 0.11.0 in
/exporter/signalfxexporter
Bump golang.org/x/sys from 0.10.0 to 0.11.0 in /pkg/stanza
Bump golang.org/x/sys from 0.10.0 to 0.11.0 in /pkg/winperfcounters
Bump golang.org/x/sys from 0.10.0 to 0.11.0 in
/receiver/hostmetricsreceiver
Bump golang.org/x/sys from 0.10.0 to 0.11.0 in
/receiver/windowseventlogreceiver
Bump golang.org/x/text from 0.11.0 to 0.12.0 in /cmd/configschema
Bump golang.org/x/text from 0.11.0 to 0.12.0 in /cmd/mdatagen
Bump golang.org/x/text from 0.11.0 to 0.12.0 in /internal/coreinternal
Bump golang.org/x/text from 0.11.0 to 0.12.0 in /pkg/stanza
Bump golang.org/x/text from 0.11.0 to 0.12.0 in /testbed
Bump golang.org/x/tools from 0.11.1 to 0.12.0 in /internal/tools
Bump sigs.k8s.io/controller-runtime from 0.15.0 to 0.15.1 in
/exporter/loadbalancingexporter

---------

Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
Bump github.com/hashicorp/golang-lru from 0.5.4 to 1.0.2 in
/extension/observer/ecsobserver
Bump github.com/hashicorp/golang-lru from 0.6.0 to 1.0.2 in
/processor/spanmetricsprocessor
Bump github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
from 1.0.717 to 1.0.719 in /exporter/tencentcloudlogserviceexporter
Bump google.golang.org/api from 0.134.0 to 0.136.0 in
/receiver/googlecloudspannerreceiver
…figopaque.String` (#24778)

clickhouse exporter also needs use `Config.Password`.

---------

Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
#25120)

**Description:** Add a new test
'testInvalidMethod' in receiver_test.go, and refactor code for
readability.
…metric (#25123)

Replaces
#25115

---------

Co-authored-by: Fabrizio Ferri-Benedetti <fferribenedetti@splunk.com>
Co-authored-by: Ryan Fitzpatrick <10867373+rmfitzpatrick@users.noreply.github.com>
**Description:** [exporter/signalfx] Added few tests for histogram
metrics on SFx exporter's converter piece

**Link to tracking Issue:**
#25067
**Description:** 
related #23266

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
**Description:** There is flaky Windows test

**Link to tracking Issue:**
#25094

**Testing:** 
Before applying this change, it has failed in 1 test out of 60. So this
should pass 200 tests without failure.
…o translateOTelToGroupedMetric (#24051)

**Description:**

The config option `retain_initial_value_of_delta_metric` does not seem
to be used in `translateOTelToGroupedMetric`, which prevents the initial
value of a basic counter from being published during a Lambda cold boot.

Please see the minimum project required to replicate the issue
[here](https://github.com/jameshi16/delta-initial-value-minimum-project).

**Link to tracking Issue:** The main issue related to this PR can be
found
[here](aws-observability/aws-otel-lambda#634).

It seems like I had a predecessor fixing this issue (see #17988), but
his changes does not work for my use case.

**Testing:** An additional test ensures that if
`retain_initial_value_of_delta_metric` is set, it will be propagated to
the `cWMetricMetadata`.

**Documentation:** None
To not update required jobs every time a new go version is released.

Needed for
#25116
@cparkins cparkins merged commit 57e4eb2 into AmadeusITGroup:main Aug 11, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet