apiVersion: release-notes/v2
kind: bug-fix
area: telemetry
issue:
- 33474
releaseNotes:
- |
  **Fixed** Prometheus [metrics merging](/docs/ops/integrations/prometheus/#option-1-metrics-merging) to

dwq <******@****.***> 1676385642 +0800

apiVersion: release-notes/v2
kind: feature
area: telemetry
issue:
- 21366
releaseNotes:
- |

apiVersion: release-notes/v2
kind: feature
area: telemetry
issue:
- 22825
releaseNotes:
- |
  **Added** Prometheus metrics to istio-agent.
- |

// - not use the replace directive.
// - generate duplicate integers for a merging list patch.
// - generate empty merging lists.
// - use patch format from an old client.
var customStrategicMergePatchTestCaseData = []byte(`
testCases:
  - description: unique scalars when merging lists
    original:
      mergingIntList:
        - 1
        - 2
    twoWay:
      mergingIntList:

// package cmerge provides a few small utility APIs for helping
// with merging of counter data for a given function.

import (
	"fmt"
	"internal/coverage"
	"math"
)

type ModeMergePolicy uint8

const (
	ModeMergeStrict ModeMergePolicy = iota
	ModeMergeRelaxed
)

// Merger provides state and methods to help manage the process of
// merging together coverage counter data for a given function, for

    factory: KotlinCompositeProviderFactory<P>,
    crossinline mergeTargets: (List<T>) -> P,
): P {
    // We should flatten providers before merging so that the merger has access to all individual providers, and also after merging because
    // composite providers may be created by the merger.
    return factory.createFlattened(factory.flatten(this).mergeOnly<_, T> { mergeTargets(it) })

apiVersion: release-notes/v2
kind: bug-fix
area: traffic-management
issue: []
releaseNotes:
- |

apiVersion: release-notes/v2
kind: bug-fix
area: installation
issue:
  - 33841
releaseNotes:
  - |
    **Fixed** a bug where specifying same port number with different protocols (TCP and UDP)

apiVersion: release-notes/v2
kind: bug-fix
area: traffic-management
issue:
  - 50478
releaseNotes:
  - |
    **Fixed** a behavioral change in Istio 1.20 that caused merging of ServiceEntries with the same hostname and port names