Skip to content

Commit 8af7a4e

Browse files
authored
Merge branch 'open-telemetry:main' into patch-1
2 parents 3bb9f76 + 56d874f commit 8af7a4e

File tree

7 files changed

+324
-315
lines changed

7 files changed

+324
-315
lines changed

.github/workflows/builder-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ jobs:
6767
args: release --clean -f cmd/builder/.goreleaser.yml
6868
env:
6969
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
70-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7171
COSIGN_YES: true
7272
SKIP_SIGNS: false

.github/workflows/builder-testbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ jobs:
6565
args: --snapshot --clean -f cmd/builder/.goreleaser.yml
6666
env:
6767
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
68-
GITHUB_TOKEN: ${{ secrets.GH_PAT}}
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6969
COSIGN_YES: false
7070
SKIP_SIGNS: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GO ?= go
22
GORELEASER ?= goreleaser
33

4-
OTELCOL_BUILDER_VERSION ?= 0.111.0
4+
OTELCOL_BUILDER_VERSION ?= 0.112.0
55
OTELCOL_BUILDER_DIR ?= ${HOME}/bin
66
OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
77

distributions/otelcol-contrib/manifest.yaml

Lines changed: 206 additions & 205 deletions
Large diffs are not rendered by default.

distributions/otelcol-k8s/manifest.yaml

Lines changed: 72 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,80 +2,88 @@ dist:
22
module: github.com/open-telemetry/opentelemetry-collector-releases/k8s
33
name: otelcol-k8s
44
description: OpenTelemetry Collector for Kubernetes
5-
version: 0.111.0
5+
version: 0.112.0
66
output_path: ./_build
7-
otelcol_version: 0.111.0
7+
otelcol_version: 0.112.0
88

99
extensions:
10-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.111.0
11-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.111.0
12-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.111.0
13-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.111.0
14-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.111.0
15-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.111.0
16-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.111.0
17-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.111.0
18-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.111.0
19-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.111.0
20-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.111.0
10+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.112.0
11+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.112.0
12+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.112.0
13+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.112.0
14+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.112.0
15+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.112.0
16+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.112.0
17+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.112.0
18+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.112.0
19+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.112.0
20+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.112.0
21+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.112.0
22+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.112.0
23+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.112.0
2124

2225
exporters:
23-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.111.0
24-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.111.0
25-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0
26-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0
27-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.111.0
28-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.111.0
29-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.111.0
26+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.112.0
27+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.112.0
28+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0
29+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.112.0
30+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.112.0
31+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.112.0
32+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.112.0
3033

3134
processors:
32-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.111.0
33-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0
34-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.111.0
35-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.111.0
36-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.111.0
37-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.111.0
38-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.111.0
39-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.111.0
40-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.111.0
41-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.111.0
42-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.111.0
43-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.111.0
44-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.111.0
45-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.111.0
46-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.111.0
47-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.111.0
48-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.111.0
49-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.111.0
35+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.112.0
36+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.112.0
37+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.112.0
38+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.112.0
39+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.112.0
40+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.112.0
41+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.112.0
42+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.112.0
43+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.112.0
44+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.112.0
45+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.112.0
46+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.112.0
47+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.112.0
48+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.112.0
49+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.112.0
50+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.112.0
51+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.112.0
52+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.112.0
53+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.112.0
5054

5155
receivers:
52-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0
53-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.111.0
54-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.111.0
55-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.111.0
56-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.111.0
57-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.111.0
58-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.111.0
59-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.111.0
60-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.111.0
61-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.111.0
62-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.111.0
63-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.111.0
64-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.111.0
65-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.111.0
66-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.111.0
67-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.111.0
56+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.112.0
57+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.112.0
58+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.112.0
59+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.112.0
60+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.112.0
61+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.112.0
62+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.112.0
63+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.112.0
64+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.112.0
65+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.112.0
66+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.112.0
67+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.112.0
68+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.112.0
69+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.112.0
70+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.112.0
71+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.112.0
6872

6973
connectors:
70-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.111.0
71-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.111.0
72-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.111.0
73-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.111.0
74-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.111.0
74+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.112.0
75+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.112.0
76+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.112.0
77+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.112.0
78+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.112.0
79+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.112.0
80+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.112.0
81+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.112.0
82+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.112.0
7583

7684
providers:
77-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.17.0
78-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.17.0
79-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.17.0
80-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0
81-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0
85+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
86+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
87+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0
88+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.18.0
89+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.18.0

distributions/otelcol-otlp/manifest.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ dist:
22
module: github.com/open-telemetry/opentelemetry-collector-releases/otlp
33
name: otelcol-otlp
44
description: OpenTelemetry Collector OTLP
5-
version: 0.111.0
5+
version: 0.112.0
66
output_path: ./_build
7-
otelcol_version: 0.111.0
7+
otelcol_version: 0.112.0
88

99
exporters:
10-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0
11-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0
10+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0
11+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.112.0
1212

1313
receivers:
14-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0
14+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.112.0
1515

1616
providers:
17-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.17.0
18-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.17.0
17+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
18+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0

0 commit comments

Comments
 (0)