Merge branch 'main' into internal_rabbitmq

Resolve conflicts in go.mod Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
open-telemetry · Aug 13, 2024 · af259d8 · af259d8
2 parents b3cae15 + c0ffc7b
commit af259d8
Show file tree

Hide file tree

Showing 1,495 changed files with 28,214 additions and 21,208 deletions.
diff --git a/.chloggen/appsignals-and-awssdk-name-adjustments.yaml b/.chloggen/appsignals-and-awssdk-name-adjustments.yaml
diff --git a/.chloggen/bc--optimizesnappybufferallocation.yaml b/.chloggen/bc--optimizesnappybufferallocation.yaml
diff --git a/.chloggen/bc--patchbufferallocations.yaml b/.chloggen/bc--patchbufferallocations.yaml
diff --git a/.chloggen/es_add_metric.yaml → .chloggen/codeboten_more-scope-10.yaml b/.chloggen/es_add_metric.yaml → .chloggen/codeboten_more-scope-10.yaml
@@ -1,16 +1,16 @@
 # Use this changelog template to create an entry for release notes.
 
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: enhancement
+change_type: breaking
 
 # The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
-component: elasticsearchreceiver
+component: lokiexporter
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add metric for active index merges
+note: "Update the scope name for telemetry produced by the lokiexporter from `otelcol/loki` to `github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter`"
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
-issues: [34387]
+issues: [34612]
 
 # (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.

diff --git a/.chloggen/configauth.yaml b/.chloggen/configauth.yaml
diff --git a/.chloggen/elasticsearch-sync-bulkindexer.yaml b/.chloggen/elasticsearch-sync-bulkindexer.yaml
diff --git a/.chloggen/entity-interval.yaml b/.chloggen/entity-interval.yaml
diff --git a/.chloggen/es_add_default_metrics.yaml b/.chloggen/es_add_default_metrics.yaml
diff --git a/.chloggen/fix_jaeger_mapping.yaml b/.chloggen/fix_jaeger_mapping.yaml
diff --git a/.chloggen/fix_operators_error_handling.yaml b/.chloggen/fix_operators_error_handling.yaml
diff --git a/.chloggen/fix_supervisor-dont-require-server-connection.yaml b/.chloggen/fix_supervisor-dont-require-server-connection.yaml
diff --git a/.chloggen/kafka-partition-logs-by-resources.yaml b/.chloggen/kafka-partition-logs-by-resources.yaml
diff --git a/.chloggen/splunk_enforce_metrics_naming_regex.yaml b/.chloggen/splunk_enforce_metrics_naming_regex.yaml
diff --git a/.chloggen/vcenterreceiver-vsan-metrics-enabled.yaml b/.chloggen/vcenterreceiver-vsan-metrics-enabled.yaml