Merge branch 'main' into mapstructure-2.0.0

open-telemetry · Jul 17, 2024 · b94fa5c · b94fa5c
2 parents 30d81d3 + 5753a58
commit b94fa5c
Show file tree

Hide file tree

Showing 128 changed files with 1,007 additions and 1,327 deletions.
diff --git a/.chloggen/better-effective-config.yaml b/.chloggen/better-effective-config.yaml
diff --git a/.chloggen/builder-empty-gomod-field.yaml b/.chloggen/builder-empty-gomod-field.yaml
diff --git a/.chloggen/codeboten_census-feature-gate.yaml → ...boten_update-all-metrics-with-prefix.yaml b/.chloggen/codeboten_census-feature-gate.yaml → ...boten_update-all-metrics-with-prefix.yaml
@@ -7,15 +7,18 @@ change_type: breaking
 component: service
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: "add `service.disableOpenCensusBridge` feature gate which is enabled by default to remove the dependency on OpenCensus"
+note: "Update all metrics to include `otelcol_` prefix to ensure consistency across OTLP and Prometheus metrics"
 
 # One or more tracking issues or pull requests related to the change
-issues: [10414]
+issues: [9759]
 
 # (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:
+subtext: |
+  This change is marked as a breaking change as anyone that was using OTLP for metrics will
+  see the new prefix which was not present before. Prometheus generated metrics remain
+  unchanged.
 
 # Optional: The change log or logs in which this entry should be included.
 # e.g. '[user]' or '[user, api]'

diff --git a/.chloggen/configauth-removed-deprecated-funcs.yaml b/.chloggen/configauth-removed-deprecated-funcs.yaml
diff --git a/.chloggen/configtls_stable.yaml b/.chloggen/configtls_stable.yaml
diff --git a/.chloggen/confmap-fix-escape-bug.yaml b/.chloggen/confmap-fix-escape-bug.yaml
diff --git a/.chloggen/deprecate-confmapprovider.yaml b/.chloggen/deprecate-confmapprovider.yaml
diff --git a/.chloggen/deprecate-getconfmap.yaml b/.chloggen/deprecate-getconfmap.yaml
diff --git a/.chloggen/fix-component-tests.yaml b/.chloggen/fix-component-tests.yaml
diff --git a/.chloggen/fix-http-grpc-error-code-mapping.yaml b/.chloggen/fix-http-grpc-error-code-mapping.yaml
diff --git a/.chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml b/.chloggen/fix-incorrectly-deduplicated-exporterhelper-metric.yaml
diff --git a/.chloggen/fix_error_format.yaml b/.chloggen/fix_error_format.yaml
diff --git a/.chloggen/jpkroehling_fix-servicename-own-telemetry.yaml b/.chloggen/jpkroehling_fix-servicename-own-telemetry.yaml
diff --git a/.chloggen/load-balancer-round-robin.yaml b/.chloggen/load-balancer-round-robin.yaml
diff --git a/.chloggen/localhostgate-info-log.yaml b/.chloggen/localhostgate-info-log.yaml
diff --git a/...porterhelper-deprecate-obsreport-api.yaml → ...atagen-remove-with-attributes-helper.yaml b/...porterhelper-deprecate-obsreport-api.yaml → ...atagen-remove-with-attributes-helper.yaml
@@ -1,16 +1,18 @@
-# Use this changelog template to create an entry for release notes.
-
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: 'deprecation'
+change_type: breaking
 
 # The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
-component: exporterhelper
+component: mdatagen
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Deprecate the obsreport API in the exporterhelper package.
+note: Remove WithAttributes option from the telemetry builder constructor.
+
+subtext: |
+  Attribute sets for async instruments now can be set as options to callback setters and async instruments initializers.
+  This allows each async instrument to have its own attribute set.
 
 # One or more tracking issues or pull requests related to the change
-issues: [10592]
+issues: [10608]
 
 # Optional: The change log or logs in which this entry should be included.
 # e.g. '[user]' or '[user, api]'