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

Merge main to prod #4524

Merged
merged 333 commits into from
Sep 13, 2023
Merged

Merge main to prod #4524

merged 333 commits into from
Sep 13, 2023

Conversation

songy23
Copy link
Member

@songy23 songy23 commented Sep 13, 2023

No description provided.

Frapschen and others added 30 commits August 10, 2023 21:09

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
…o translateOTelToGroupedMetric (open-telemetry#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 open-telemetry#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
…lemetry#25151)

To not update required jobs every time a new go version is released.

Needed for
open-telemetry#25116
…bute (open-telemetry#23668)

**Description:** 
Add k8s.cluster.uid to attribute to k8sattributes processor and disable
it by default for backward compatibility. Users can set it to `true` to
populate cluster uid as part of resource attributes.

**Link to tracking Issue:**
open-telemetry#21974
This is primarily to align the version with what the Collector uses in
`confmap`. It doesn't introduce any functional changes.
**Description:** 
related open-telemetry#23266

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
…ry#25182)

Bump github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2 in
/receiver/pulsarreceiver
This pull request is for a newly created Datadog connector that replaces
the need for the Datadog processor. This replacement is needed because
the processor made use of a work-around that directly allowed the
processor to export data. This is not something that adheres to the
OpenTelemetry standard and thus the previous system should be deprecated
and replaced by this new connector.

Link to issue:
open-telemetry#19740

---------

Co-authored-by: Yang Song <songy23@users.noreply.github.com>
Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>
…ent concurrent write to buffer. (open-telemetry#25100)

Change the TCP/UDP inputs so that they parse the
encoding and get the `encoding.Encoding` during initialization, but wait
to create the `helper.Encoding` instance in each goroutine. This
prevents concurrent calls to `Decode` using the same instance.

Co-authored-by: Dan Jaglowski <jaglows3@gmail.com>
…mote mode of usage (open-telemetry#24981)

Updates the jaegerremotesampling extension's `remote` mode of usage to
support the `reload_interval` caching option already supported in `file`
mode of usage.

Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
… nested attributes containing dots to labels (open-telemetry#25142)

When the value for loki hint attribute contains dots (more than 1 dot)
and attributes are nested so some level contains dotted attribute name
(for example `{"log": {"file.name": "foo"}}`), the getNestedAttribute
function throws a panic

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Corresponds to [Step
3](https://github.com/open-telemetry/opentelemetry-collector/blob/81242fa7eff332756df6e03034c0e6686b9b988e/docs/release.md?plain=1#L34)
of collector core release process. Updated as part of Step 8.

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>
Co-authored-by: Alex Boten <aboten@lightstep.com>
…ry#25810)

Bump github.com/ClickHouse/clickhouse-go/v2 from 2.12.1 to 2.13.0 in
/exporter/clickhouseexporter
Bump github.com/antonmedv/expr from 1.12.5 to 1.13.0 in
/receiver/receivercreator
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.322 in
/exporter/kafkaexporter
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.322 in
/internal/aws/k8s
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.322 in
/internal/aws/xray/testdata/sampleapp
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.322 in
/receiver/awscontainerinsightreceiver
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.322 in
/receiver/awsxrayreceiver
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/exporter/awscloudwatchlogsexporter
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/exporter/awsxrayexporter
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/exporter/kafkaexporter
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/internal/aws/k8s
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/internal/aws/proxy
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/internal/aws/xray
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/internal/aws/xray/testdata/sampleapp
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/receiver/awscontainerinsightreceiver
Bump github.com/aws/aws-sdk-go from 1.44.319 to 1.44.323 in
/receiver/awsxrayreceiver
Bump github.com/daixiang0/gci from 0.10.1 to 0.11.0 in /internal/tools
Bump github.com/golangci/golangci-lint from 1.53.3 to 1.54.1 in
/internal/tools
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /extension/observer/dockerobserver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /internal/coreinternal
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/aerospikereceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/apachereceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/dockerstatsreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/elasticsearchreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/jmxreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/kafkametricsreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/nginxreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/postgresqlreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/redisreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/sqlqueryreceiver
Bump github.com/testcontainers/testcontainers-go from 0.22.0 to 0.23.0
in /receiver/zookeeperreceiver
Bump go.mongodb.org/atlas from 0.32.0 to 0.33.0 in
/receiver/mongodbatlasreceiver
Bump go.opentelemetry.io/collector from 0.82.0 to 0.83.0 in /pkg/stanza
Bump go.opentelemetry.io/collector from 0.82.0 to 0.83.0 in
/receiver/carbonreceiver
Bump go.opentelemetry.io/collector/cmd/builder from
0.82.1-0.20230811173841-81242fa7eff3 to 0.83.0 in /internal/tools
Bump go.opentelemetry.io/collector/component from 0.82.0 to 0.83.0 in
/exporter/logzioexporter
Bump go.opentelemetry.io/collector/config/confighttp from 0.82.0 to
0.83.0 in /receiver/elasticsearchreceiver
Bump go.opentelemetry.io/collector/config/confighttp from 0.82.0 to
0.83.0 in /receiver/skywalkingreceiver
Bump go.opentelemetry.io/collector/config/confignet from 0.82.0 to
0.83.0 in /extension/jaegerremotesampling
Bump go.opentelemetry.io/collector/config/configopaque from 0.82.0 to
0.83.0 in /extension/jaegerremotesampling
Bump go.opentelemetry.io/collector/config/configtls from 0.82.0 to
0.83.0 in /processor/resourcedetectionprocessor
Bump go.opentelemetry.io/collector/config/configtls from 0.82.0 to
0.83.0 in /receiver/sapmreceiver
Bump go.opentelemetry.io/collector/config/configtls from 0.82.0 to
0.83.0 in /receiver/signalfxreceiver
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/exporter/splunkhecexporter
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/processor/logstransformprocessor
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/receiver/awsfirehosereceiver
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/receiver/rabbitmqreceiver
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/receiver/saphanareceiver
Bump go.opentelemetry.io/collector/confmap from 0.82.0 to 0.83.0 in
/receiver/signalfxreceiver
Bump go.opentelemetry.io/collector/consumer from 0.82.0 to 0.83.0 in
/exporter/opencensusexporter
Bump go.opentelemetry.io/collector/consumer from 0.82.0 to 0.83.0 in
/processor/logstransformprocessor
Bump go.opentelemetry.io/collector/consumer from 0.82.0 to 0.83.0 in
/processor/resourcedetectionprocessor
Bump go.opentelemetry.io/collector/consumer from 0.82.0 to 0.83.0 in
/receiver/mysqlreceiver
Bump go.opentelemetry.io/collector/consumer from 0.82.0 to 0.83.0 in
/receiver/nsxtreceiver
Bump go.opentelemetry.io/collector/processor from 0.82.0 to 0.83.0 in
/exporter/datadogexporter
Bump go.opentelemetry.io/collector/receiver from 0.82.0 to 0.83.0 in
/receiver/dockerstatsreceiver
Bump go.opentelemetry.io/collector/receiver from 0.82.0 to 0.83.0 in
/receiver/googlecloudpubsubreceiver
Bump go.opentelemetry.io/collector/semconv from 0.82.0 to 0.83.0 in
/exporter/awsemfexporter
Bump go.opentelemetry.io/collector/semconv from 0.82.0 to 0.83.0 in
/receiver/hostmetricsreceiver
The following commands were run to prepare this release:
- make chlog-update VERSION=v0.83.0
- sed -i.bak s/0.82.0/0.83.0/g versions.yaml
- make multimod-prerelease
- make multimod-sync
Followup to the v0.83.0 release.

The chloggen tool was recently upgraded to support multiple separate
changelogs. While the tool worked correctly, several entries were added
prior to the new feature being added, resulting in several entries going
to the default (user) changelog rather than the api changelog.
…25818)

**Description:** 
related open-telemetry#23266

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
…telemetry#25153)

**Description:** 
Moves existing config validation into the Validate function

**Testing:** 
Added more unit tests

---------

Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
…en-telemetry#25826)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[otel/opentelemetry-collector-contrib](https://togithub.com/open-telemetry/opentelemetry-collector-releases)
| minor | `0.82.0` -> `0.83.0` |

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-collector-releases
(otel/opentelemetry-collector-contrib)</summary>

###
[`v0.83.0`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/releases/tag/v0.83.0)

[Compare
Source](https://togithub.com/open-telemetry/opentelemetry-collector-releases/compare/v0.82.0...v0.83.0)

#### Changelog

-
[`66a5e00`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/66a5e00)
Prep release v0.83.0
([#&open-telemetry#8203;388](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/388))
-
[`8eb6a21`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/8eb6a21)
Bump github.com/goreleaser/goreleaser from 1.19.2 to 1.20.0
([#&open-telemetry#8203;387](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/387))
-
[`9157d9d`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/9157d9d)
\[admin] Add criteria for distributions
([#&open-telemetry#8203;376](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/376))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi40My4yIiwidXBkYXRlZEluVmVyIjoiMzYuNDMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
dmitryax and others added 25 commits September 8, 2023 15:18
To ensure that no tests fail with the latest merges in core
This updates core once again because of the missed deps.

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>
**Description:**
Set up the telemetrygen job to restart on failure

**Link to tracking Issue:**
Fixes open-telemetry#24223


**Testing:**
See
open-telemetry#26530 (comment)
This investigation shows that the job fails to run sometimes. All other
deployments have a policy to restart on failure.
…ry#26571)

Bump google.golang.org/api from 0.138.0 to 0.139.0 in
/receiver/googlecloudspannerreceiver
Bump google.golang.org/grpc from 1.57.0 to 1.58.0 in
/receiver/googlecloudspannerreceiver
Linked issue open-telemetry#26304

Signed-off-by: Jared Tan <jian.tan@daocloud.io>
)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

Add optional k8s.kubelet.version, k8s.kubeproxy.version node resource
attributes

Doing some actual testing with kind with k8s_cluster receiver and
prometheus exporters.

```
     k8s_cluster:                                                    
        node_conditions_to_report: [Ready, MemoryPressure]            
        allocatable_types_to_report: [cpu, memory]                    
        resource_attributes:                                                                      
          k8s.kubelet.version:
            enabled: true 
          k8s.kubeproxy.version:                                      
            enabled: true   
 ```  
and prometheus exporter:
```
   prometheus:
        resource_to_telemetry_conversion:
          enabled: true
        endpoint: 0.0.0.0:9090
```

Example metric:

```

k8s_node_allocatable_cpu{k8s_kubelet_version="v1.25.3",k8s_kubeproxy_version="v1.25.3",k8s_node_name="kind-control-plane",k8s_node_uid="09b55a47-87cb-4790-8834-2341d683999d",opencensus_resourcetype="k8s"}
8
```

**Link to tracking Issue:** 
open-telemetry#24835

**Testing:** <Describe what testing was performed and which tests were added.>

- added unit tests
- manua ltest with kind

**Documentation:** <Describe the documentation added.>
- generated
…es (open-telemetry#26516)

**Description:**
Remove support for deprecated Kubernetes API resources: 
- `batch/v1beta1`
- `autoscaling/v2beta2`

This also resolves the issue with double reporting metrics for hpa and
cronjob in certain k8s versions.

**Link to tracking Issue(s):**
open-telemetry#23612 open-telemetry#26551

**Testing:**
From source, built the custom image
[coolboi567/otelcontribcol:0.83.1](https://hub.docker.com/layers/coolboi567/otelcontribcol/0.83.1/images/sha256-fe111e1dff87a26eb64217a8505b84679263c8d7b3ffa16656bba1c1865052d5?context=explore)
and tested in kubernetes cluster `v1.25` as well as `v1.27`.

In K8s `v1.25`, we no longer see the warnings in the logs about usage of
deprecated APIs.

**Documentation:**
N/A

---------

Signed-off-by: Prashant Shahi <me@prashantshahi.dev>
Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
Subset of open-telemetry#26241 

Follows open-telemetry#26540 

- Rename `MultilineConfig` to `split.Config`
- Remove `Multiline`, previously a struct representation that only
wrapped a split func
- Remove `NewMultilineConfig`, because `split.Config` is just two simple
fields with "" defaults.
- Condense references in tests
- Substantially increate test coverage in `split` package.
…n-telemetry#26098)

**Description:** 
Updates the receiver to properly handle 410 response code. The
expectations for what clients should do when a 410 is received can be
found here:
https://kubernetes.io/docs/reference/using-api/api-concepts/#410-gone-responses.

I originally implemented this feature directly in `startWatch`,
rebuilding the watcher and res channel within the for loop, but I grew
concerned about making sure everything stopped correctly. I took a look
at the retry watcher's implementation and reused its concepts for this
implementation. If it is overcomplicated we can go back to my original
idea.

**Link to tracking Issue:** <Issue number if applicable>

Closes
open-telemetry#24903

**Testing:** <Describe what testing was performed and which tests were
added.>

Tested locally. Unit tests proved to be extremely challenging since I
couldn't figure out how to get the mock to produce a 410. We really need
e2e tests
(open-telemetry#18395).

---------

Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com>
For some reason, `make update-otel` failed for me. Will make a note to
add an issue

Signed-off-by: Alex Boten <aboten@lightstep.com>
…metry#26366)

**Description:** CWL Logs exporter was using an alias for the exporter
package to avoid a naming conflict. I renamed the internal struct to
resolve the error and remove the need for the alias. I did not create a
breaking changelog entry for this as no api surface was changed.

**Link to tracking Issue:** open-telemetry#26304
…etry#26642)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| prom/prometheus | minor | `v2.46.0` -> `v2.47.0` |

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
The following commands were run to prepare this release:
- make chlog-update VERSION=v0.85.0
- sed -i.bak s/0.84.0/0.85.0/g versions.yaml
- make multimod-prerelease
- make multimod-sync
Another few remaining parts of open-telemetry#26241. This basically follows up on
renaming the `multiline` package by renaming a few remaining to
"multiline" throughout the codebase.
…ry#26652)

Bump github.com/Azure/go-amqp from 1.0.1 to 1.0.2 in
/receiver/solacereceiver
Bump github.com/alecthomas/participle/v2 from 2.0.0 to 2.1.0 in
/pkg/ottl
Bump github.com/antonmedv/expr from 1.15.0 to 1.15.1 in /pkg/stanza
Bump github.com/antonmedv/expr from 1.15.0 to 1.15.1 in
/receiver/receivercreator
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/exporter/awscloudwatchlogsexporter
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/exporter/awsemfexporter
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/exporter/awsxrayexporter
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/exporter/datadogexporter
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/exporter/kafkaexporter
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/extension/observer/ecsobserver
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/awsutil
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/cwlogs
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/k8s
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/proxy
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/xray
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/aws/xray/testdata/sampleapp
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/internal/metadataproviders
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/processor/resourcedetectionprocessor
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/receiver/awscontainerinsightreceiver
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/receiver/awsecscontainermetricsreceiver
Bump github.com/aws/aws-sdk-go from 1.45.2 to 1.45.7 in
/receiver/awsxrayreceiver
Bump github.com/aws/aws-sdk-go-v2/config from 1.18.38 to 1.18.39 in
/exporter/awskinesisexporter
Bump github.com/aws/aws-sdk-go-v2/config from 1.18.38 to 1.18.39 in
/extension/sigv4authextension
Bump github.com/aws/aws-sdk-go-v2/credentials from 1.13.36 to 1.13.37 in
/exporter/awskinesisexporter
Bump github.com/aws/aws-sdk-go-v2/credentials from 1.13.36 to 1.13.37 in
/extension/sigv4authextension
Bump github.com/daixiang0/gci from 0.11.0 to 0.11.1 in /internal/tools
Bump github.com/docker/docker from 24.0.5+incompatible to
24.0.6+incompatible in /extension/observer/dockerobserver
Bump github.com/docker/docker from 24.0.5+incompatible to
24.0.6+incompatible in /internal/docker
Bump github.com/docker/docker from 24.0.5+incompatible to
24.0.6+incompatible in /internal/metadataproviders
Bump github.com/docker/docker from 24.0.5+incompatible to
24.0.6+incompatible in /receiver/dockerstatsreceiver
Bump github.com/getsentry/sentry-go from 0.23.0 to 0.24.0 in
/exporter/sentryexporter
Bump github.com/grpc-ecosystem/grpc-gateway/v2 from 2.17.1 to 2.18.0 in
/receiver/opencensusreceiver
Bump github.com/rs/cors from 1.9.0 to 1.10.0 in
/receiver/opencensusreceiver
Bump github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
from 1.0.741 to 1.0.746 in /exporter/tencentcloudlogserviceexporter
Bump golang.org/x/net from 0.14.0 to 0.15.0 in /internal/aws/awsutil
Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 in
/exporter/f5cloudexporter
Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 in
/extension/oauth2clientauthextension
Bump golang.org/x/tools from 0.12.1-0.20230815132531-74c255bcf846 to
0.13.0 in /internal/tools
Bump google.golang.org/api from 0.139.0 to 0.140.0 in
/receiver/googlecloudspannerreceiver
open-telemetry#26591)

Bumps [github.com/daixiang0/gci](https://github.com/daixiang0/gci) from
0.11.0 to 0.11.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/daixiang0/gci/releases">github.com/daixiang0/gci's
releases</a>.</em></p>
<blockquote>
<h2>v0.11.1</h2>
<h2>What's Changed</h2>
<ul>
<li>fix ^M by <a
href="https://github.com/daixiang0"><code>@​daixiang0</code></a> in <a
href="https://redirect.github.com/daixiang0/gci/pull/168">daixiang0/gci#168</a></li>
<li>bump up version by <a
href="https://github.com/daixiang0"><code>@​daixiang0</code></a> in <a
href="https://redirect.github.com/daixiang0/gci/pull/169">daixiang0/gci#169</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/daixiang0/gci/compare/v0.11.0...v0.11.1">https://github.com/daixiang0/gci/compare/v0.11.0...v0.11.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/daixiang0/gci/commit/e452b4b4573a0a6174a2e24a715db46cb5c46f22"><code>e452b4b</code></a>
bump up version (<a
href="https://redirect.github.com/daixiang0/gci/issues/169">#169</a>)</li>
<li><a
href="https://github.com/daixiang0/gci/commit/50cd6b7e54b6ba5adc06d98d50a598c7de1be2e4"><code>50cd6b7</code></a>
fix ^M (<a
href="https://redirect.github.com/daixiang0/gci/issues/168">#168</a>)</li>
<li>See full diff in <a
href="https://github.com/daixiang0/gci/compare/v0.11.0...v0.11.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/daixiang0/gci&package-manager=go_modules&previous-version=0.11.0&new-version=0.11.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
stop exporting `NewMockClient` method to align with checkapi standards
as related to issue open-telemetry#26304

**Link to tracking Issue:** open-telemetry#26304
…o v0.85.0 (open-telemetry#26658)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[otel/opentelemetry-collector-contrib](https://togithub.com/open-telemetry/opentelemetry-collector-releases)
| minor | `0.84.0` -> `0.85.0` |

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-collector-releases
(otel/opentelemetry-collector-contrib)</summary>

###
[`v0.85.0`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/releases/tag/v0.85.0)

[Compare
Source](https://togithub.com/open-telemetry/opentelemetry-collector-releases/compare/v0.84.0...v0.85.0)

#### Changelog

-
[`7503715`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/7503715)
\[chore] prepare v0.85.0 release
([#&open-telemetry#8203;398](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/398))
-
[`3feca60`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/3feca60)
Update go versions
([#&open-telemetry#8203;395](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/395))
-
[`feaae89`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/feaae89)
Bump actions/checkout from 3 to 4
([#&open-telemetry#8203;397](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/397))
-
[`dc7a1ac`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/dc7a1ac)
Removing deprecated jaeger and jaegerthrifthttp exporters
([#&open-telemetry#8203;396](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/396))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
…#26255)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

Fix Metrics that count objects should use units with brackets {} and not
1.

Marking it as bug_fix because of
open-telemetry#10553 (comment)

Tested with prometheus exporter:
Previously:
```
# HELP k8s_deployment_available Total number of available pods (ready for at least minReadySeconds) targeted by this deployment
# TYPE k8s_deployment_available gauge
k8s_deployment_available 1
# HELP k8s_deployment_desired Number of desired pods in this deployment
# TYPE k8s_deployment_desired gauge
k8s_deployment_desired 1
```

Now:

```
# HELP k8s_deployment_available Total number of available pods (ready for at least minReadySeconds) targeted by this deployment
# TYPE k8s_deployment_available gauge
k8s_deployment_available 1
# HELP k8s_deployment_desired Number of desired pods in this deployment
# TYPE k8s_deployment_desired gauge
k8s_deployment_desired 1
```

Atleast for this backend it's not breaking change?

**Link to tracking Issue:**  10553


open-telemetry#10553


**Testing:** <Describe what testing was performed and which tests were
added.>
- updated tests

**Documentation:** 
- generated
…etry#26546)

This follows the deprecation plan to remove the component. The original
removal date was July 2023, it is now past that.

Linked issue:
open-telemetry/opentelemetry-specification#3551

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>
…n field ordering (open-telemetry#25705)

Remove the ottlarg struct tag and rely on field ordering
**Link to tracking Issue:**
open-telemetry#24874
@songy23 songy23 requested review from a team and gbbr and removed request for a team September 13, 2023 18:16
@songy23 songy23 merged commit f2c0fa6 into prod Sep 13, 2023
@songy23 songy23 deleted the yang.song/merge-main branch September 13, 2023 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet