Merge branch 'main' into split-binary-ci

Author: mowies

.chloggen/prometheus-exporter.yaml

@@ -0,0 +1,26 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service/telemetry
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Pins go.opentelemetry.io/otel/exporters/prometheus to v0.58.0"
+
+# One or more tracking issues or pull requests related to the change
+issues: [1067]
+
+# (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: "go.opentelemetry.io/otel/exporters/prometheus v0.59.x has a bug leading to unexpected suffix in metric names, we want to stay with v0.58.0 in the artifacts."
+
+# 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]
+

cmd/builder/.goreleaser.yml

@@ -142,6 +142,6 @@ sboms:
   - id: package
     artifacts: package
 nightly:
-  version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
   tag_name: nightly-builder
   keep_single_release: true

cmd/goreleaser/internal/configure.go

@@ -324,7 +324,7 @@ func (b *distributionBuilder) WithNightlyConfig() *distributionBuilder {
 
 func (b *distributionBuilder) nightly() config.Nightly {
 	return config.Nightly{
-		VersionTemplate:   "{{ incpatch .Version}}-nightly.{{ .Now.Format \"200601021504\" }}",
+		VersionTemplate:   "{{ incpatch .Version}}-nightly.{{ .ShortCommit }}",
 		TagName:           fmt.Sprintf("nightly-%s", b.dist.name),
 		PublishRelease:    false,
 		KeepSingleRelease: true,

cmd/opampsupervisor/.goreleaser.yml

@@ -142,7 +142,7 @@ sboms:
   - id: package
     artifacts: package
 nightly:
-  version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
   tag_name: nightly-opamp-supervisor
   keep_single_release: true
 

distributions/otelcol-contrib/.goreleaser-build.yaml

@@ -60,6 +60,6 @@ monorepo:
 partial:
   by: target
 nightly:
-  version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
   tag_name: nightly-otelcol-contrib
   keep_single_release: true

distributions/otelcol-contrib/.goreleaser.yaml

@@ -331,6 +331,6 @@ monorepo:
 partial:
   by: target
 nightly:
-  version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
   tag_name: nightly-otelcol-contrib
   keep_single_release: true

distributions/otelcol-contrib/manifest.yaml

@@ -262,3 +262,5 @@ providers:
 replaces:
   # see https://github.com/openshift/api/pull/1515
   - github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec
+  # see https://github.com/open-telemetry/opentelemetry-collector/pull/13466
+  - go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.58.0

distributions/otelcol-ebpf-profiler/manifest.yaml

@@ -35,3 +35,4 @@ providers:
 replaces:
   # see https://github.com/openshift/api/pull/1515
   - github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec
+  - go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.58.0

distributions/otelcol-k8s/.goreleaser.yaml

@@ -211,6 +211,6 @@ monorepo:
 partial:
   by: target
 nightly:
-  version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}'
+  version_template: '{{ incpatch .Version}}-nightly.{{ .ShortCommit }}'
   tag_name: nightly-otelcol-k8s
   keep_single_release: true

distributions/otelcol-k8s/manifest.yaml

@@ -89,3 +89,6 @@ providers:
   - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.37.0
   - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.37.0
   - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.37.0
+
+replaces:
+  - go.opentelemetry.io/otel/exporters/prometheus => go.opentelemetry.io/otel/exporters/prometheus v0.58.0