Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc/grpc-go
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.69.0
Choose a base ref
...
head repository: grpc/grpc-go
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.69.2
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 13, 2024

  1. Copy the full SHA
    97d633a View commit details
  2. Copy the full SHA
    927a1e1 View commit details
  3. Copy the full SHA
    9355fbc View commit details

Commits on Dec 16, 2024

  1. examples/features/csm_observability: Make CSM Observability example s…

    …erver listen on an IPV4 address (#7933) (#7934)
    zasweq authored Dec 16, 2024
    Copy the full SHA
    b6e7c72 View commit details

Commits on Dec 18, 2024

  1. Copy the full SHA
    4535c6d View commit details
  2. Copy the full SHA
    6b36a3e View commit details
  3. Copy the full SHA
    b615b35 View commit details
Showing with 17 additions and 2 deletions.
  1. +1 −1 examples/features/csm_observability/server/main.go
  2. +15 −0 experimental/stats/metrics.go
  3. +1 −1 version.go
2 changes: 1 addition & 1 deletion examples/features/csm_observability/server/main.go
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ func main() {
cleanup := csm.EnableObservability(context.Background(), opentelemetry.Options{MetricsOptions: opentelemetry.MetricsOptions{MeterProvider: provider}})
defer cleanup()

lis, err := net.Listen("tcp", ":"+*port)
lis, err := net.Listen("tcp4", "0.0.0.0:"+*port)
if err != nil {
log.Fatalf("Failed to listen: %v", err)
}
15 changes: 15 additions & 0 deletions experimental/stats/metrics.go
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@
// Package stats contains experimental metrics/stats API's.
package stats

import "google.golang.org/grpc/stats"

// MetricsRecorder records on metrics derived from metric registry.
type MetricsRecorder interface {
// RecordInt64Count records the measurement alongside labels on the int
@@ -37,3 +39,16 @@ type MetricsRecorder interface {
// gauge associated with the provided handle.
RecordInt64Gauge(handle *Int64GaugeHandle, incr int64, labels ...string)
}

// Metrics is an experimental legacy alias of the now-stable stats.MetricSet.
// Metrics will be deleted in a future release.
type Metrics = stats.MetricSet

// Metric was replaced by direct usage of strings.
type Metric = string

// NewMetrics is an experimental legacy alias of the now-stable
// stats.NewMetricSet. NewMetrics will be deleted in a future release.
func NewMetrics(metrics ...Metric) *Metrics {
return stats.NewMetricSet(metrics...)
}
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -19,4 +19,4 @@
package grpc

// Version is the current grpc version.
const Version = "1.69.0-dev"
const Version = "1.69.2"