diff --git a/cmd/pdatagen/internal/metrics_structs.go b/cmd/pdatagen/internal/metrics_structs.go index 4def50ef2b7..4c4615cd091 100644 --- a/cmd/pdatagen/internal/metrics_structs.go +++ b/cmd/pdatagen/internal/metrics_structs.go @@ -340,7 +340,7 @@ var quantileValues = &messageValueStruct{ }, } -var intExemplarSlice = &sliceOfPtrs{ +var intExemplarSlice = &sliceOfValues{ structName: "IntExemplarSlice", element: intExemplar, } @@ -363,7 +363,7 @@ var intExemplar = &messageValueStruct{ }, } -var doubleExemplarSlice = &sliceOfPtrs{ +var doubleExemplarSlice = &sliceOfValues{ structName: "DoubleExemplarSlice", element: doubleExemplar, } diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go index 82a02ef6cfa..d35cddf67d0 100644 --- a/consumer/pdata/generated_metrics.go +++ b/consumer/pdata/generated_metrics.go @@ -2138,17 +2138,17 @@ func (ms ValueAtQuantile) CopyTo(dest ValueAtQuantile) { type IntExemplarSlice struct { // orig points to the slice otlpmetrics.IntExemplar field contained somewhere else. // We use pointer-to-slice to be able to modify it in functions like Resize. - orig *[]*otlpmetrics.IntExemplar + orig *[]otlpmetrics.IntExemplar } -func newIntExemplarSlice(orig *[]*otlpmetrics.IntExemplar) IntExemplarSlice { +func newIntExemplarSlice(orig *[]otlpmetrics.IntExemplar) IntExemplarSlice { return IntExemplarSlice{orig} } // NewIntExemplarSlice creates a IntExemplarSlice with 0 elements. // Can use "Resize" to initialize with a given length. func NewIntExemplarSlice() IntExemplarSlice { - orig := []*otlpmetrics.IntExemplar(nil) + orig := []otlpmetrics.IntExemplar(nil) return IntExemplarSlice{&orig} } @@ -2167,7 +2167,7 @@ func (es IntExemplarSlice) Len() int { // ... // Do something with the element // } func (es IntExemplarSlice) At(ix int) IntExemplar { - return newIntExemplar((*es.orig)[ix]) + return newIntExemplar(&(*es.orig)[ix]) } // MoveAndAppendTo moves all elements from the current slice and appends them to the dest. @@ -2188,18 +2188,13 @@ func (es IntExemplarSlice) CopyTo(dest IntExemplarSlice) { destCap := cap(*dest.orig) if srcLen <= destCap { (*dest.orig) = (*dest.orig)[:srcLen:destCap] - for i := range *es.orig { - newIntExemplar((*es.orig)[i]).CopyTo(newIntExemplar((*dest.orig)[i])) - } - return + } else { + (*dest.orig) = make([]otlpmetrics.IntExemplar, srcLen) } - origs := make([]otlpmetrics.IntExemplar, srcLen) - wrappers := make([]*otlpmetrics.IntExemplar, srcLen) + for i := range *es.orig { - wrappers[i] = &origs[i] - newIntExemplar((*es.orig)[i]).CopyTo(newIntExemplar(wrappers[i])) + newIntExemplar(&(*es.orig)[i]).CopyTo(newIntExemplar(&(*dest.orig)[i])) } - *dest.orig = wrappers } // Resize is an operation that resizes the slice: @@ -2222,15 +2217,15 @@ func (es IntExemplarSlice) Resize(newLen int) { } if newLen > oldCap { - newOrig := make([]*otlpmetrics.IntExemplar, oldLen, newLen) + newOrig := make([]otlpmetrics.IntExemplar, oldLen, newLen) copy(newOrig, *es.orig) *es.orig = newOrig } // Add extra empty elements to the array. - extraOrigs := make([]otlpmetrics.IntExemplar, newLen-oldLen) - for i := range extraOrigs { - *es.orig = append(*es.orig, &extraOrigs[i]) + empty := otlpmetrics.IntExemplar{} + for i := oldLen; i < newLen; i++ { + *es.orig = append(*es.orig, empty) } } @@ -2239,7 +2234,7 @@ func (es IntExemplarSlice) Resize(newLen int) { // could still be referenced so do not reuse it after passing it to this // method. func (es IntExemplarSlice) Append(e IntExemplar) { - *es.orig = append(*es.orig, e.orig) + *es.orig = append(*es.orig, *e.orig) } // IntExemplar is a sample input int measurement. @@ -2319,17 +2314,17 @@ func (ms IntExemplar) CopyTo(dest IntExemplar) { type DoubleExemplarSlice struct { // orig points to the slice otlpmetrics.DoubleExemplar field contained somewhere else. // We use pointer-to-slice to be able to modify it in functions like Resize. - orig *[]*otlpmetrics.DoubleExemplar + orig *[]otlpmetrics.DoubleExemplar } -func newDoubleExemplarSlice(orig *[]*otlpmetrics.DoubleExemplar) DoubleExemplarSlice { +func newDoubleExemplarSlice(orig *[]otlpmetrics.DoubleExemplar) DoubleExemplarSlice { return DoubleExemplarSlice{orig} } // NewDoubleExemplarSlice creates a DoubleExemplarSlice with 0 elements. // Can use "Resize" to initialize with a given length. func NewDoubleExemplarSlice() DoubleExemplarSlice { - orig := []*otlpmetrics.DoubleExemplar(nil) + orig := []otlpmetrics.DoubleExemplar(nil) return DoubleExemplarSlice{&orig} } @@ -2348,7 +2343,7 @@ func (es DoubleExemplarSlice) Len() int { // ... // Do something with the element // } func (es DoubleExemplarSlice) At(ix int) DoubleExemplar { - return newDoubleExemplar((*es.orig)[ix]) + return newDoubleExemplar(&(*es.orig)[ix]) } // MoveAndAppendTo moves all elements from the current slice and appends them to the dest. @@ -2369,18 +2364,13 @@ func (es DoubleExemplarSlice) CopyTo(dest DoubleExemplarSlice) { destCap := cap(*dest.orig) if srcLen <= destCap { (*dest.orig) = (*dest.orig)[:srcLen:destCap] - for i := range *es.orig { - newDoubleExemplar((*es.orig)[i]).CopyTo(newDoubleExemplar((*dest.orig)[i])) - } - return + } else { + (*dest.orig) = make([]otlpmetrics.DoubleExemplar, srcLen) } - origs := make([]otlpmetrics.DoubleExemplar, srcLen) - wrappers := make([]*otlpmetrics.DoubleExemplar, srcLen) + for i := range *es.orig { - wrappers[i] = &origs[i] - newDoubleExemplar((*es.orig)[i]).CopyTo(newDoubleExemplar(wrappers[i])) + newDoubleExemplar(&(*es.orig)[i]).CopyTo(newDoubleExemplar(&(*dest.orig)[i])) } - *dest.orig = wrappers } // Resize is an operation that resizes the slice: @@ -2403,15 +2393,15 @@ func (es DoubleExemplarSlice) Resize(newLen int) { } if newLen > oldCap { - newOrig := make([]*otlpmetrics.DoubleExemplar, oldLen, newLen) + newOrig := make([]otlpmetrics.DoubleExemplar, oldLen, newLen) copy(newOrig, *es.orig) *es.orig = newOrig } // Add extra empty elements to the array. - extraOrigs := make([]otlpmetrics.DoubleExemplar, newLen-oldLen) - for i := range extraOrigs { - *es.orig = append(*es.orig, &extraOrigs[i]) + empty := otlpmetrics.DoubleExemplar{} + for i := oldLen; i < newLen; i++ { + *es.orig = append(*es.orig, empty) } } @@ -2420,7 +2410,7 @@ func (es DoubleExemplarSlice) Resize(newLen int) { // could still be referenced so do not reuse it after passing it to this // method. func (es DoubleExemplarSlice) Append(e DoubleExemplar) { - *es.orig = append(*es.orig, e.orig) + *es.orig = append(*es.orig, *e.orig) } // DoubleExemplar is a sample input double measurement. diff --git a/consumer/pdata/generated_metrics_test.go b/consumer/pdata/generated_metrics_test.go index e025d7b2ce5..6be029b2d84 100644 --- a/consumer/pdata/generated_metrics_test.go +++ b/consumer/pdata/generated_metrics_test.go @@ -1578,7 +1578,7 @@ func TestValueAtQuantile_Value(t *testing.T) { func TestIntExemplarSlice(t *testing.T) { es := NewIntExemplarSlice() assert.EqualValues(t, 0, es.Len()) - es = newIntExemplarSlice(&[]*otlpmetrics.IntExemplar{}) + es = newIntExemplarSlice(&[]otlpmetrics.IntExemplar{}) assert.EqualValues(t, 0, es.Len()) es.Resize(7) @@ -1679,12 +1679,12 @@ func TestIntExemplarSlice_Append(t *testing.T) { emptyVal := NewIntExemplar() es.Append(emptyVal) - assert.EqualValues(t, emptyVal.orig, es.At(7).orig) + assert.EqualValues(t, emptyVal, es.At(7)) value := NewIntExemplar() fillTestIntExemplar(value) es.Append(value) - assert.EqualValues(t, value.orig, es.At(8).orig) + assert.EqualValues(t, value, es.At(8)) assert.Equal(t, 9, es.Len()) } @@ -1722,7 +1722,7 @@ func TestIntExemplar_FilteredLabels(t *testing.T) { func TestDoubleExemplarSlice(t *testing.T) { es := NewDoubleExemplarSlice() assert.EqualValues(t, 0, es.Len()) - es = newDoubleExemplarSlice(&[]*otlpmetrics.DoubleExemplar{}) + es = newDoubleExemplarSlice(&[]otlpmetrics.DoubleExemplar{}) assert.EqualValues(t, 0, es.Len()) es.Resize(7) @@ -1823,12 +1823,12 @@ func TestDoubleExemplarSlice_Append(t *testing.T) { emptyVal := NewDoubleExemplar() es.Append(emptyVal) - assert.EqualValues(t, emptyVal.orig, es.At(7).orig) + assert.EqualValues(t, emptyVal, es.At(7)) value := NewDoubleExemplar() fillTestDoubleExemplar(value) es.Append(value) - assert.EqualValues(t, value.orig, es.At(8).orig) + assert.EqualValues(t, value, es.At(8)) assert.Equal(t, 9, es.Len()) } diff --git a/consumer/simple/metrics_test.go b/consumer/simple/metrics_test.go index 412face9c90..802d2c2767a 100644 --- a/consumer/simple/metrics_test.go +++ b/consumer/simple/metrics_test.go @@ -123,7 +123,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 9000000 + "value": 9000000, + "exemplars": null } ] } @@ -142,7 +143,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 50 + "value": 50, + "exemplars": null }, { "labels": [ @@ -156,7 +158,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 5 + "value": 5, + "exemplars": null } ] } @@ -175,7 +178,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 30.5 + "value": 30.5, + "exemplars": null } ] } @@ -194,7 +198,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 100.6 + "value": 100.6, + "exemplars": null } ] } @@ -217,7 +222,8 @@ func TestMetrics(t *testing.T) { } ], "time_unix_nano": 1597266546570840817, - "value": 40000 + "value": 40000, + "exemplars": null } ] } @@ -230,7 +236,8 @@ func TestMetrics(t *testing.T) { "data_points": [ { "labels": [], - "time_unix_nano": 1597266546570840817 + "time_unix_nano": 1597266546570840817, + "exemplars": null } ] } @@ -243,7 +250,8 @@ func TestMetrics(t *testing.T) { "data_points": [ { "labels": [], - "time_unix_nano": 1597266546570840817 + "time_unix_nano": 1597266546570840817, + "exemplars": null } ] } diff --git a/internal/data/protogen/metrics/v1/metrics.pb.go b/internal/data/protogen/metrics/v1/metrics.pb.go index 3c1e4b83f9a..344c895487e 100644 --- a/internal/data/protogen/metrics/v1/metrics.pb.go +++ b/internal/data/protogen/metrics/v1/metrics.pb.go @@ -911,7 +911,7 @@ type IntDataPoint struct { Value int64 `protobuf:"fixed64,4,opt,name=value,proto3" json:"value,omitempty"` // (Optional) List of exemplars collected from // measurements that were used to form the data point - Exemplars []*IntExemplar `protobuf:"bytes,5,rep,name=exemplars,proto3" json:"exemplars,omitempty"` + Exemplars []IntExemplar `protobuf:"bytes,5,rep,name=exemplars,proto3" json:"exemplars"` } func (m *IntDataPoint) Reset() { *m = IntDataPoint{} } @@ -975,7 +975,7 @@ func (m *IntDataPoint) GetValue() int64 { return 0 } -func (m *IntDataPoint) GetExemplars() []*IntExemplar { +func (m *IntDataPoint) GetExemplars() []IntExemplar { if m != nil { return m.Exemplars } @@ -1009,7 +1009,7 @@ type DoubleDataPoint struct { Value float64 `protobuf:"fixed64,4,opt,name=value,proto3" json:"value,omitempty"` // (Optional) List of exemplars collected from // measurements that were used to form the data point - Exemplars []*DoubleExemplar `protobuf:"bytes,5,rep,name=exemplars,proto3" json:"exemplars,omitempty"` + Exemplars []DoubleExemplar `protobuf:"bytes,5,rep,name=exemplars,proto3" json:"exemplars"` } func (m *DoubleDataPoint) Reset() { *m = DoubleDataPoint{} } @@ -1073,7 +1073,7 @@ func (m *DoubleDataPoint) GetValue() float64 { return 0 } -func (m *DoubleDataPoint) GetExemplars() []*DoubleExemplar { +func (m *DoubleDataPoint) GetExemplars() []DoubleExemplar { if m != nil { return m.Exemplars } @@ -1138,7 +1138,7 @@ type IntHistogramDataPoint struct { ExplicitBounds []float64 `protobuf:"fixed64,7,rep,packed,name=explicit_bounds,json=explicitBounds,proto3" json:"explicit_bounds,omitempty"` // (Optional) List of exemplars collected from // measurements that were used to form the data point - Exemplars []*IntExemplar `protobuf:"bytes,8,rep,name=exemplars,proto3" json:"exemplars,omitempty"` + Exemplars []IntExemplar `protobuf:"bytes,8,rep,name=exemplars,proto3" json:"exemplars"` } func (m *IntHistogramDataPoint) Reset() { *m = IntHistogramDataPoint{} } @@ -1223,7 +1223,7 @@ func (m *IntHistogramDataPoint) GetExplicitBounds() []float64 { return nil } -func (m *IntHistogramDataPoint) GetExemplars() []*IntExemplar { +func (m *IntHistogramDataPoint) GetExemplars() []IntExemplar { if m != nil { return m.Exemplars } @@ -1288,7 +1288,7 @@ type DoubleHistogramDataPoint struct { ExplicitBounds []float64 `protobuf:"fixed64,7,rep,packed,name=explicit_bounds,json=explicitBounds,proto3" json:"explicit_bounds,omitempty"` // (Optional) List of exemplars collected from // measurements that were used to form the data point - Exemplars []*DoubleExemplar `protobuf:"bytes,8,rep,name=exemplars,proto3" json:"exemplars,omitempty"` + Exemplars []DoubleExemplar `protobuf:"bytes,8,rep,name=exemplars,proto3" json:"exemplars"` } func (m *DoubleHistogramDataPoint) Reset() { *m = DoubleHistogramDataPoint{} } @@ -1373,7 +1373,7 @@ func (m *DoubleHistogramDataPoint) GetExplicitBounds() []float64 { return nil } -func (m *DoubleHistogramDataPoint) GetExemplars() []*DoubleExemplar { +func (m *DoubleHistogramDataPoint) GetExemplars() []DoubleExemplar { if m != nil { return m.Exemplars } @@ -1740,86 +1740,86 @@ func init() { } var fileDescriptor_3c3112f9fa006917 = []byte{ - // 1254 bytes of a gzipped FileDescriptorProto + // 1257 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xda, 0x89, 0xe3, 0x3c, 0x3b, 0xb6, 0x19, 0x95, 0x74, 0x15, 0xa9, 0x6e, 0xea, 0xa2, - 0x36, 0xf4, 0x87, 0xad, 0xa6, 0x6a, 0x85, 0x40, 0x08, 0xec, 0xd8, 0x4d, 0x4c, 0x9d, 0xd6, 0xac, - 0x9d, 0xa0, 0xa2, 0x4a, 0xab, 0xb5, 0x77, 0x70, 0x47, 0xec, 0xce, 0x98, 0xdd, 0xd9, 0x28, 0xb9, - 0x22, 0x71, 0xab, 0x04, 0x12, 0x27, 0xf8, 0x8b, 0x7a, 0xec, 0x01, 0xa9, 0x08, 0x89, 0x0a, 0xb5, - 0x12, 0x17, 0x4e, 0xdc, 0x39, 0xa0, 0x99, 0xdd, 0x8d, 0xed, 0x64, 0x13, 0x3b, 0xb4, 0x48, 0x69, - 0x6f, 0x6f, 0xde, 0xbc, 0xf7, 0xcd, 0x7b, 0xdf, 0x7b, 0xf3, 0x76, 0x6c, 0xb8, 0xc6, 0x06, 0x98, - 0x72, 0x6c, 0x61, 0x1b, 0x73, 0x67, 0xaf, 0x3c, 0x70, 0x18, 0x67, 0x65, 0x21, 0x93, 0x9e, 0x5b, - 0xde, 0xb9, 0x11, 0x8a, 0x25, 0xb9, 0x81, 0x0a, 0x63, 0xd6, 0xbe, 0xb2, 0x14, 0x9a, 0xec, 0xdc, - 0x58, 0x3a, 0xd3, 0x67, 0x7d, 0xe6, 0x63, 0x08, 0xc9, 0x37, 0x58, 0xba, 0x12, 0x75, 0x46, 0x8f, - 0xd9, 0x36, 0xa3, 0xe2, 0x08, 0x5f, 0x0a, 0x6c, 0x4b, 0x51, 0xb6, 0x0e, 0x76, 0x99, 0xe7, 0xf4, - 0xb0, 0xb0, 0x0e, 0x65, 0xdf, 0xbe, 0xf8, 0xa7, 0x02, 0x39, 0x2d, 0x50, 0x6d, 0xfa, 0x81, 0xa0, - 0xbb, 0x90, 0x0a, 0xad, 0x54, 0x65, 0x59, 0x59, 0x49, 0xaf, 0xbe, 0x5f, 0x8a, 0x0a, 0x7c, 0x1f, - 0x6a, 0xe7, 0x46, 0x29, 0xc4, 0xa8, 0xce, 0x3c, 0x79, 0x7e, 0x3e, 0xa6, 0xed, 0x03, 0xa0, 0xef, - 0x14, 0x38, 0x4f, 0xa8, 0xcb, 0x1d, 0xcf, 0xc6, 0x94, 0x1b, 0x9c, 0x30, 0xaa, 0x5b, 0xa4, 0xeb, - 0x18, 0xce, 0x9e, 0x1e, 0x64, 0xae, 0xc6, 0x97, 0x13, 0x2b, 0xe9, 0xd5, 0x8f, 0x4b, 0xc7, 0xb3, - 0x53, 0x6a, 0x8c, 0xc3, 0x34, 0x7d, 0x94, 0x20, 0x6a, 0xed, 0x1c, 0x39, 0x6e, 0xbb, 0xf8, 0x4c, - 0x81, 0x73, 0xc7, 0x02, 0x20, 0x0e, 0x67, 0x8f, 0x08, 0x34, 0x60, 0xe1, 0x56, 0x64, 0x80, 0x01, - 0xfd, 0x47, 0xc6, 0x17, 0x30, 0xb2, 0x18, 0x1d, 0x1e, 0xfa, 0x14, 0xe6, 0xc6, 0x69, 0xb8, 0x34, - 0x89, 0x06, 0x3f, 0x5e, 0x2d, 0x74, 0x2b, 0x7e, 0x3f, 0x0b, 0x49, 0x5f, 0x87, 0x10, 0xcc, 0x50, - 0xc3, 0xf6, 0xab, 0x36, 0xaf, 0x49, 0x19, 0x2d, 0x43, 0xda, 0xc4, 0x6e, 0xcf, 0x21, 0x03, 0x71, - 0xac, 0x1a, 0x97, 0x5b, 0xa3, 0x2a, 0xe1, 0xe5, 0x51, 0xc2, 0xd5, 0x84, 0xef, 0x25, 0x64, 0xb4, - 0x0e, 0xf3, 0x84, 0x72, 0xbd, 0x6f, 0x78, 0x7d, 0xac, 0xce, 0xc8, 0xf4, 0x57, 0x26, 0xd7, 0x87, - 0xaf, 0x0b, 0xfb, 0x8d, 0x98, 0x96, 0x22, 0x81, 0x8c, 0x5a, 0x90, 0x31, 0x99, 0xd7, 0xb5, 0x70, - 0x80, 0x35, 0x2b, 0xb1, 0xae, 0x4e, 0xc2, 0xaa, 0x49, 0x9f, 0x10, 0x2e, 0x6d, 0x0e, 0x97, 0xa8, - 0x02, 0x73, 0x22, 0x34, 0xd7, 0xb3, 0xd5, 0xa4, 0x04, 0xbb, 0x34, 0x45, 0x60, 0x6d, 0xcf, 0xde, - 0x88, 0x69, 0x49, 0x22, 0x25, 0xf4, 0x19, 0x40, 0x10, 0x94, 0x40, 0x99, 0x3b, 0xa6, 0xc7, 0x0f, - 0x85, 0xe4, 0x03, 0xcd, 0x9b, 0xe1, 0x02, 0xb5, 0x61, 0x41, 0x84, 0xf3, 0x88, 0xb8, 0x9c, 0xf5, - 0x1d, 0xc3, 0x56, 0x53, 0x12, 0xee, 0xda, 0x14, 0x41, 0x6d, 0x84, 0x3e, 0x1b, 0x31, 0x2d, 0x43, - 0x46, 0xd6, 0xe8, 0x21, 0xe4, 0x83, 0x00, 0x87, 0xb8, 0xf3, 0x12, 0xb7, 0x3c, 0x5d, 0x98, 0xa3, - 0xd0, 0x39, 0x73, 0x5c, 0x85, 0xb6, 0x21, 0x3b, 0x4c, 0xdf, 0x16, 0x0d, 0x9e, 0x96, 0xd8, 0xd7, - 0xa7, 0xa6, 0x40, 0x38, 0x6d, 0xc4, 0xb4, 0x05, 0x73, 0x54, 0x51, 0x4d, 0xc2, 0x8c, 0x69, 0x70, - 0xa3, 0xf8, 0x00, 0x52, 0x61, 0x2f, 0xa0, 0x4d, 0x48, 0x0b, 0x9d, 0x3e, 0x60, 0x84, 0x72, 0x57, - 0x55, 0x64, 0x8f, 0x4f, 0x43, 0x4e, 0xcd, 0xe0, 0x46, 0x4b, 0x38, 0x69, 0x60, 0x86, 0xa2, 0x5b, - 0xd4, 0x21, 0x3d, 0xd2, 0x1a, 0xa8, 0x15, 0x85, 0x3e, 0x25, 0x45, 0xd1, 0x07, 0xfc, 0xa5, 0x40, - 0xd2, 0xef, 0x97, 0xd7, 0x1c, 0x3a, 0x62, 0x70, 0xd6, 0xe8, 0xf7, 0x1d, 0xdc, 0xf7, 0x67, 0x0b, - 0xc7, 0xf6, 0x80, 0x39, 0x86, 0x45, 0xf8, 0x9e, 0xbc, 0x94, 0xd9, 0xd5, 0xdb, 0x93, 0xa0, 0x2b, - 0x43, 0xf7, 0xce, 0xd0, 0x5b, 0x5b, 0x34, 0x22, 0xf5, 0xe8, 0x02, 0x64, 0x88, 0xab, 0xdb, 0x8c, - 0x32, 0xce, 0x28, 0xe9, 0xc9, 0xfb, 0x9d, 0xd2, 0xd2, 0xc4, 0xdd, 0x0c, 0x55, 0xc5, 0xbf, 0x15, - 0x98, 0xdf, 0x2f, 0xea, 0xeb, 0x67, 0xf3, 0x54, 0xe6, 0xfc, 0x4c, 0x81, 0xcc, 0xe8, 0xe5, 0x43, - 0xdb, 0x51, 0x69, 0xdf, 0x3a, 0xc9, 0xfd, 0x3d, 0x1d, 0xc9, 0x17, 0x7f, 0x57, 0x20, 0x77, 0xe0, - 0xfa, 0xa3, 0x07, 0x51, 0xc9, 0x7d, 0x70, 0xc2, 0x21, 0x72, 0x4a, 0xf2, 0x7b, 0x04, 0x0b, 0x63, - 0x13, 0x08, 0x7d, 0x11, 0x95, 0xdc, 0xed, 0x13, 0x4d, 0xb1, 0xe8, 0x29, 0xf0, 0x63, 0x5c, 0xf6, - 0xc8, 0xfe, 0x26, 0xba, 0x0b, 0x49, 0xcb, 0xe8, 0x62, 0x2b, 0x3c, 0xe4, 0xfa, 0x84, 0xb7, 0x40, - 0x9b, 0x3b, 0x84, 0xf6, 0xef, 0xe2, 0xbd, 0x6d, 0xc3, 0xf2, 0xc2, 0x57, 0x51, 0x00, 0x81, 0xca, - 0x70, 0xc6, 0xe5, 0x86, 0xc3, 0x75, 0x4e, 0x6c, 0xac, 0x7b, 0x94, 0xec, 0xea, 0xd4, 0xa0, 0x4c, - 0xb2, 0x96, 0xd4, 0xde, 0x91, 0x7b, 0x1d, 0x62, 0xe3, 0x2d, 0x4a, 0x76, 0xef, 0x19, 0x94, 0xa1, - 0xf7, 0x20, 0x7b, 0xc0, 0x34, 0x21, 0x4d, 0x33, 0x7c, 0xd4, 0xea, 0x0c, 0xcc, 0xee, 0x88, 0xd3, - 0xe4, 0xf7, 0x3a, 0xaf, 0xf9, 0x0b, 0xd4, 0x80, 0x79, 0xbc, 0x8b, 0xed, 0x81, 0x65, 0x38, 0xae, - 0x3a, 0x2b, 0x83, 0xbf, 0x3a, 0x45, 0x6f, 0xd7, 0x03, 0x1f, 0x6d, 0xe8, 0x5d, 0xfc, 0x29, 0x1e, - 0xf6, 0xd7, 0x1b, 0x4c, 0x8c, 0x12, 0x12, 0xd3, 0x3c, 0x4c, 0x4c, 0x69, 0xba, 0xd6, 0x89, 0xe2, - 0xe6, 0x9f, 0x38, 0xbc, 0x1b, 0x39, 0x12, 0xde, 0x14, 0x86, 0x7a, 0xcc, 0xa3, 0x5c, 0x32, 0x94, - 0xd4, 0xfc, 0x05, 0xca, 0x43, 0x42, 0xbc, 0x8f, 0x66, 0x65, 0x3b, 0x09, 0x11, 0x5d, 0x84, 0x85, - 0xae, 0xd7, 0xfb, 0x1a, 0x73, 0x5d, 0x5a, 0xb8, 0x6a, 0x72, 0x39, 0x21, 0xc0, 0x7c, 0xe5, 0x9a, - 0xd4, 0xa1, 0xcb, 0x90, 0xc3, 0xbb, 0x03, 0x8b, 0xf4, 0x08, 0xd7, 0xbb, 0xcc, 0xa3, 0xa6, 0xab, - 0xce, 0x2d, 0x27, 0x56, 0x14, 0x2d, 0x1b, 0xaa, 0xab, 0x52, 0x3b, 0xde, 0x9a, 0xa9, 0x57, 0x6a, - 0xcd, 0x6f, 0x13, 0xa0, 0x1e, 0x35, 0xb4, 0xde, 0x8e, 0x0a, 0x28, 0xff, 0x47, 0x05, 0x9a, 0x87, - 0x2b, 0xf0, 0x0a, 0x77, 0xe0, 0xe7, 0x04, 0x2c, 0x46, 0x0f, 0xd7, 0xb7, 0xaa, 0x04, 0x0c, 0x72, - 0xdf, 0x78, 0x06, 0xe5, 0xc4, 0xc2, 0xba, 0x1c, 0x25, 0x7e, 0x11, 0xd2, 0xab, 0x77, 0xfe, 0xdb, - 0x97, 0xa7, 0x24, 0x73, 0xac, 0xf0, 0xcf, 0x03, 0x50, 0x2d, 0x1b, 0xc2, 0xcb, 0x0d, 0x77, 0x69, - 0x0d, 0x72, 0x07, 0x4c, 0xd0, 0x12, 0xa4, 0x42, 0x23, 0xf9, 0x6b, 0x4f, 0xd1, 0xf6, 0xd7, 0xc3, - 0x71, 0x17, 0x1f, 0x19, 0x77, 0xc5, 0x5f, 0xe2, 0x90, 0x1e, 0xb9, 0x3c, 0xe8, 0x21, 0xe4, 0xbe, - 0x22, 0x16, 0xc7, 0x0e, 0x36, 0xf5, 0x57, 0x2f, 0x4d, 0x36, 0xc4, 0x6a, 0xfa, 0x25, 0x3a, 0xcc, - 0x78, 0xfc, 0xb8, 0xc1, 0x9c, 0x18, 0xfd, 0x62, 0xb5, 0x61, 0xce, 0x1d, 0x18, 0x54, 0x27, 0xa6, - 0xac, 0x44, 0xa6, 0xfa, 0xa1, 0x38, 0xe2, 0xb7, 0xe7, 0xe7, 0x57, 0xfb, 0xec, 0x40, 0x6c, 0x84, - 0x95, 0x7b, 0xcc, 0xb2, 0x70, 0x8f, 0x33, 0xa7, 0x4c, 0x28, 0xc7, 0x0e, 0x35, 0xac, 0xb2, 0xf8, - 0x90, 0x97, 0xda, 0x03, 0x83, 0x36, 0x6a, 0x5a, 0x52, 0x40, 0x35, 0x4c, 0xb4, 0x0d, 0x29, 0xee, - 0x18, 0x3d, 0x2c, 0x50, 0x67, 0x25, 0xea, 0x47, 0x01, 0xea, 0xcd, 0x93, 0xa0, 0x76, 0x04, 0x46, - 0xa3, 0xa6, 0xcd, 0x49, 0xb0, 0x86, 0x59, 0x7c, 0x16, 0x87, 0xec, 0xf8, 0x8d, 0x38, 0x7d, 0xcc, - 0x2a, 0x6f, 0x22, 0xb3, 0x57, 0x1e, 0x2b, 0xb0, 0x18, 0xfd, 0x40, 0x44, 0x97, 0xe1, 0x62, 0x65, - 0x7d, 0x5d, 0xab, 0xaf, 0x57, 0x3a, 0x8d, 0xfb, 0xf7, 0xf4, 0x4e, 0x7d, 0xb3, 0x75, 0x5f, 0xab, - 0x34, 0x1b, 0x9d, 0x07, 0xfa, 0xd6, 0xbd, 0x76, 0xab, 0xbe, 0xd6, 0xb8, 0xd3, 0xa8, 0xd7, 0xf2, - 0x31, 0x74, 0x01, 0xce, 0x1d, 0x65, 0x58, 0xab, 0x37, 0x3b, 0x95, 0xbc, 0x82, 0x2e, 0x41, 0xf1, - 0x28, 0x93, 0xb5, 0xad, 0xcd, 0xad, 0x66, 0xa5, 0xd3, 0xd8, 0xae, 0xe7, 0xe3, 0xd5, 0xc7, 0xca, - 0x93, 0x17, 0x05, 0xe5, 0xe9, 0x8b, 0x82, 0xf2, 0xc7, 0x8b, 0x82, 0xf2, 0xc3, 0xcb, 0x42, 0xec, - 0xe9, 0xcb, 0x42, 0xec, 0xd7, 0x97, 0x85, 0x18, 0x5c, 0x20, 0x6c, 0xc2, 0xcd, 0xaf, 0x66, 0x82, - 0x7f, 0x99, 0x5a, 0x62, 0xa3, 0xa5, 0x7c, 0xf9, 0xc9, 0x09, 0xa8, 0xf1, 0xff, 0xc5, 0xeb, 0x63, - 0x3a, 0xf2, 0xc7, 0x62, 0x37, 0x29, 0x95, 0x37, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xbb, - 0xa8, 0x3e, 0x81, 0x14, 0x00, 0x00, + 0x14, 0xf6, 0xda, 0x89, 0xe3, 0x3c, 0x3b, 0x76, 0x18, 0x95, 0x74, 0x15, 0xa9, 0x6e, 0xea, 0xa2, + 0x36, 0xf4, 0x87, 0xad, 0xa6, 0x6a, 0x85, 0x40, 0x08, 0x9c, 0xc4, 0x4d, 0x4c, 0x93, 0xd6, 0x4c, + 0x9c, 0xa0, 0xa2, 0x4a, 0xab, 0xb5, 0x77, 0x70, 0x47, 0xec, 0xce, 0x98, 0xdd, 0xd9, 0x28, 0xb9, + 0x22, 0x21, 0x71, 0xa8, 0x04, 0x57, 0xb8, 0xf0, 0xef, 0xf4, 0xd8, 0x03, 0x52, 0x11, 0x12, 0x15, + 0x6a, 0x25, 0x2e, 0x9c, 0xf8, 0x0f, 0xd0, 0xcc, 0xee, 0xc6, 0x76, 0xb2, 0x8e, 0x1d, 0x5a, 0xa4, + 0xb4, 0xb7, 0xb7, 0x6f, 0xde, 0x7c, 0xf3, 0xbd, 0xef, 0xbd, 0x79, 0xbb, 0x36, 0x5c, 0xe3, 0x5d, + 0xc2, 0x04, 0xb1, 0x89, 0x43, 0x84, 0xbb, 0x5f, 0xe9, 0xba, 0x5c, 0xf0, 0x8a, 0xb4, 0x69, 0xdb, + 0xab, 0xec, 0xde, 0x88, 0xcc, 0xb2, 0x5a, 0x40, 0xc5, 0x81, 0xe8, 0xc0, 0x59, 0x8e, 0x42, 0x76, + 0x6f, 0xcc, 0x9f, 0xe9, 0xf0, 0x0e, 0x0f, 0x30, 0xa4, 0x15, 0x04, 0xcc, 0x5f, 0x89, 0x3b, 0xa3, + 0xcd, 0x1d, 0x87, 0x33, 0x79, 0x44, 0x60, 0x85, 0xb1, 0xe5, 0xb8, 0x58, 0x97, 0x78, 0xdc, 0x77, + 0xdb, 0x44, 0x46, 0x47, 0x76, 0x10, 0x5f, 0xfa, 0x4b, 0x83, 0x02, 0x0e, 0x5d, 0x9b, 0x01, 0x11, + 0x74, 0x17, 0x32, 0x51, 0x94, 0xae, 0x2d, 0x68, 0x8b, 0xd9, 0xa5, 0xf7, 0xcb, 0x71, 0xc4, 0x0f, + 0xa0, 0x76, 0x6f, 0x94, 0x23, 0x8c, 0xe5, 0x89, 0x27, 0xcf, 0xcf, 0x27, 0xf0, 0x01, 0x00, 0xfa, + 0x4e, 0x83, 0xf3, 0x94, 0x79, 0xc2, 0xf5, 0x1d, 0xc2, 0x84, 0x29, 0x28, 0x67, 0x86, 0x4d, 0x5b, + 0xae, 0xe9, 0xee, 0x1b, 0x61, 0xe6, 0x7a, 0x72, 0x21, 0xb5, 0x98, 0x5d, 0xfa, 0xb8, 0x7c, 0xbc, + 0x3a, 0xe5, 0xfa, 0x20, 0xcc, 0x46, 0x80, 0x12, 0xb2, 0xc6, 0xe7, 0xe8, 0x71, 0xcb, 0xa5, 0x67, + 0x1a, 0x9c, 0x3b, 0x16, 0x00, 0x09, 0x38, 0x3b, 0x84, 0x68, 0xa8, 0xc2, 0xad, 0x58, 0x82, 0xa1, + 0xfc, 0x43, 0xf9, 0x85, 0x8a, 0xcc, 0xc5, 0xd3, 0x43, 0x9f, 0xc2, 0xd4, 0xa0, 0x0c, 0x97, 0x46, + 0xc9, 0x10, 0xf0, 0xc5, 0xd1, 0xb6, 0xd2, 0x0f, 0x93, 0x90, 0x0e, 0x7c, 0x08, 0xc1, 0x04, 0x33, + 0x9d, 0xa0, 0x6a, 0xd3, 0x58, 0xd9, 0x68, 0x01, 0xb2, 0x16, 0xf1, 0xda, 0x2e, 0xed, 0xca, 0x63, + 0xf5, 0xa4, 0x5a, 0xea, 0x77, 0xc9, 0x5d, 0x3e, 0xa3, 0x42, 0x4f, 0x05, 0xbb, 0xa4, 0x8d, 0xd6, + 0x60, 0x9a, 0x32, 0x61, 0x74, 0x4c, 0xbf, 0x43, 0xf4, 0x09, 0x95, 0xfe, 0xe2, 0xe8, 0xfa, 0x88, + 0x35, 0x19, 0xbf, 0x9e, 0xc0, 0x19, 0x1a, 0xda, 0xa8, 0x01, 0x39, 0x8b, 0xfb, 0x2d, 0x9b, 0x84, + 0x58, 0x93, 0x0a, 0xeb, 0xea, 0x28, 0xac, 0x55, 0xb5, 0x27, 0x82, 0xcb, 0x5a, 0xbd, 0x47, 0x54, + 0x85, 0x29, 0x49, 0xcd, 0xf3, 0x1d, 0x3d, 0xad, 0xc0, 0x2e, 0x8d, 0x41, 0x6c, 0xcb, 0x77, 0xd6, + 0x13, 0x38, 0x4d, 0x95, 0x85, 0x3e, 0x03, 0x08, 0x49, 0x49, 0x94, 0xa9, 0x63, 0x7a, 0xfc, 0x08, + 0xa5, 0x00, 0x68, 0xda, 0x8a, 0x1e, 0xd0, 0x16, 0xcc, 0x48, 0x3a, 0x8f, 0xa8, 0x27, 0x78, 0xc7, + 0x35, 0x1d, 0x3d, 0xa3, 0xe0, 0xae, 0x8d, 0x41, 0x6a, 0x3d, 0xda, 0xb3, 0x9e, 0xc0, 0x39, 0xda, + 0xf7, 0x8c, 0x1e, 0xc2, 0x6c, 0x48, 0xb0, 0x87, 0x3b, 0xad, 0x70, 0x2b, 0xe3, 0xd1, 0xec, 0x87, + 0x2e, 0x58, 0x83, 0x2e, 0xb4, 0x03, 0xf9, 0x5e, 0xfa, 0x8e, 0x6c, 0xf0, 0xac, 0xc2, 0xbe, 0x3e, + 0xb6, 0x04, 0x72, 0xd3, 0x7a, 0x02, 0xcf, 0x58, 0xfd, 0x8e, 0xe5, 0x34, 0x4c, 0x58, 0xa6, 0x30, + 0x4b, 0x0f, 0x20, 0x13, 0xf5, 0x02, 0xda, 0x84, 0xac, 0xf4, 0x19, 0x5d, 0x4e, 0x99, 0xf0, 0x74, + 0x4d, 0xf5, 0xf8, 0x38, 0xe2, 0xac, 0x9a, 0xc2, 0x6c, 0xc8, 0x4d, 0x18, 0xac, 0xc8, 0xf4, 0x4a, + 0x06, 0x64, 0xfb, 0x5a, 0x03, 0x35, 0xe2, 0xd0, 0xc7, 0x94, 0x28, 0xfe, 0x80, 0xbf, 0x35, 0x48, + 0x07, 0xfd, 0xf2, 0x9a, 0xa9, 0x23, 0x0e, 0x67, 0xcd, 0x4e, 0xc7, 0x25, 0x9d, 0x60, 0xb6, 0x08, + 0xe2, 0x74, 0xb9, 0x6b, 0xda, 0x54, 0xec, 0xab, 0x4b, 0x99, 0x5f, 0xba, 0x3d, 0x0a, 0xba, 0xda, + 0xdb, 0xde, 0xec, 0xed, 0xc6, 0x73, 0x66, 0xac, 0x1f, 0x5d, 0x80, 0x1c, 0xf5, 0x0c, 0x87, 0x33, + 0x2e, 0x38, 0xa3, 0x6d, 0x75, 0xbf, 0x33, 0x38, 0x4b, 0xbd, 0xcd, 0xc8, 0x55, 0xfa, 0x47, 0x83, + 0xe9, 0x83, 0xa2, 0xbe, 0x7e, 0x35, 0x4f, 0x65, 0xce, 0xcf, 0x34, 0xc8, 0xf5, 0x5f, 0x3e, 0xb4, + 0x13, 0x97, 0xf6, 0xad, 0x93, 0xdc, 0xdf, 0xd3, 0x91, 0x7c, 0xe9, 0x0f, 0x0d, 0x0a, 0x87, 0xae, + 0x3f, 0x7a, 0x10, 0x97, 0xdc, 0x07, 0x27, 0x1c, 0x22, 0xa7, 0x24, 0xbf, 0x47, 0x30, 0x33, 0x30, + 0x81, 0xd0, 0x17, 0x71, 0xc9, 0xdd, 0x3e, 0xd1, 0x14, 0x8b, 0x9f, 0x02, 0x3f, 0x25, 0x55, 0x8f, + 0x1c, 0x2c, 0xa2, 0xbb, 0x90, 0xb6, 0xcd, 0x16, 0xb1, 0xa3, 0x43, 0xae, 0x8f, 0xf8, 0x16, 0xd8, + 0x12, 0x2e, 0x65, 0x9d, 0xbb, 0x64, 0x7f, 0xc7, 0xb4, 0xfd, 0xe8, 0xab, 0x28, 0x84, 0x40, 0x15, + 0x38, 0xe3, 0x09, 0xd3, 0x15, 0x86, 0xa0, 0x0e, 0x31, 0x7c, 0x46, 0xf7, 0x0c, 0x66, 0x32, 0xae, + 0x54, 0x4b, 0xe3, 0x77, 0xd4, 0x5a, 0x93, 0x3a, 0x64, 0x9b, 0xd1, 0xbd, 0x7b, 0x26, 0xe3, 0xe8, + 0x3d, 0xc8, 0x1f, 0x0a, 0x4d, 0xa9, 0xd0, 0x9c, 0xe8, 0x8f, 0x3a, 0x03, 0x93, 0xbb, 0xf2, 0x34, + 0xf5, 0xbe, 0x9e, 0xc5, 0xc1, 0x03, 0xba, 0x0f, 0xd3, 0x64, 0x8f, 0x38, 0x5d, 0xdb, 0x74, 0x3d, + 0x7d, 0x52, 0x91, 0xbf, 0x3a, 0x46, 0x6f, 0xd7, 0xc2, 0x3d, 0x21, 0xf5, 0x1e, 0x46, 0xe9, 0x97, + 0x64, 0xd4, 0x65, 0x6f, 0xb0, 0x3c, 0x5a, 0x24, 0x0f, 0x3e, 0x2a, 0x4f, 0x79, 0xbc, 0x06, 0x1a, + 0xae, 0xd0, 0xb7, 0x29, 0x78, 0x37, 0x76, 0x3c, 0xbc, 0x29, 0x3a, 0xb5, 0xb9, 0xcf, 0x84, 0xd2, + 0x29, 0x8d, 0x83, 0x07, 0x34, 0x0b, 0x29, 0xf9, 0xad, 0x34, 0xa9, 0x5a, 0x4b, 0x9a, 0xe8, 0x22, + 0xcc, 0xb4, 0xfc, 0xf6, 0xd7, 0x44, 0x18, 0x2a, 0xc2, 0xd3, 0xd3, 0x0b, 0x29, 0x09, 0x16, 0x38, + 0x57, 0x94, 0x0f, 0x5d, 0x86, 0x02, 0xd9, 0xeb, 0xda, 0xb4, 0x4d, 0x85, 0xd1, 0xe2, 0x3e, 0xb3, + 0x3c, 0x7d, 0x6a, 0x21, 0xb5, 0xa8, 0xe1, 0x7c, 0xe4, 0x5e, 0x56, 0xde, 0xc1, 0x36, 0xcd, 0xbc, + 0x86, 0x36, 0xfd, 0x3e, 0x05, 0xfa, 0xb0, 0x31, 0xf6, 0x76, 0xd4, 0x41, 0xfb, 0x3f, 0xea, 0x80, + 0x8f, 0xd6, 0xe1, 0x95, 0xef, 0xc3, 0xcf, 0x29, 0x98, 0x8b, 0x1f, 0xba, 0x6f, 0x55, 0x21, 0x38, + 0x14, 0xbe, 0xf1, 0x4d, 0x26, 0xa8, 0x4d, 0x0c, 0x35, 0x5c, 0x82, 0x52, 0x64, 0x97, 0xee, 0xfc, + 0xb7, 0x37, 0x52, 0x59, 0xe5, 0x58, 0x15, 0x9f, 0x87, 0xa0, 0x38, 0x1f, 0xc1, 0xab, 0x05, 0x6f, + 0x7e, 0x05, 0x0a, 0x87, 0x42, 0xd0, 0x3c, 0x64, 0xa2, 0x20, 0xf5, 0x2b, 0x50, 0xc3, 0x07, 0xcf, + 0xbd, 0x01, 0x98, 0xec, 0x1b, 0x80, 0xa5, 0x5f, 0x93, 0x90, 0xed, 0xbb, 0x48, 0xe8, 0x21, 0x14, + 0xbe, 0xa2, 0xb6, 0x20, 0x2e, 0xb1, 0x8c, 0x57, 0x2f, 0x4d, 0x3e, 0xc2, 0xda, 0x08, 0x4a, 0x74, + 0x54, 0xf1, 0xe4, 0x71, 0xa3, 0x3a, 0xd5, 0xff, 0x26, 0xdb, 0x82, 0x29, 0xaf, 0x6b, 0x32, 0x83, + 0x5a, 0xaa, 0x12, 0xb9, 0xe5, 0x0f, 0xe5, 0x11, 0xbf, 0x3f, 0x3f, 0xbf, 0xd4, 0xe1, 0x87, 0xb8, + 0x51, 0x5e, 0x69, 0x73, 0xdb, 0x26, 0x6d, 0xc1, 0xdd, 0x0a, 0x65, 0x82, 0xb8, 0xcc, 0xb4, 0x2b, + 0xf2, 0x05, 0x5f, 0xde, 0xea, 0x9a, 0xac, 0xbe, 0x8a, 0xd3, 0x12, 0xaa, 0x6e, 0xa1, 0x1d, 0xc8, + 0x08, 0xd7, 0x6c, 0x13, 0x89, 0x3a, 0xa9, 0x50, 0x3f, 0x0a, 0x51, 0x6f, 0x9e, 0x04, 0xb5, 0x29, + 0x31, 0xea, 0xab, 0x78, 0x4a, 0x81, 0xd5, 0xad, 0xd2, 0xb3, 0x24, 0xe4, 0x07, 0xef, 0xc5, 0xe9, + 0x53, 0x56, 0x7b, 0x13, 0x95, 0xbd, 0xf2, 0x58, 0x83, 0xb9, 0xf8, 0x0f, 0x47, 0x74, 0x19, 0x2e, + 0x56, 0xd7, 0xd6, 0x70, 0x6d, 0xad, 0xda, 0xac, 0xdf, 0xbf, 0x67, 0x34, 0x6b, 0x9b, 0x8d, 0xfb, + 0xb8, 0xba, 0x51, 0x6f, 0x3e, 0x30, 0xb6, 0xef, 0x6d, 0x35, 0x6a, 0x2b, 0xf5, 0x3b, 0xf5, 0xda, + 0xea, 0x6c, 0x02, 0x5d, 0x80, 0x73, 0xc3, 0x02, 0x57, 0x6b, 0x1b, 0xcd, 0xea, 0xac, 0x86, 0x2e, + 0x41, 0x69, 0x58, 0xc8, 0xca, 0xf6, 0xe6, 0xf6, 0x46, 0xb5, 0x59, 0xdf, 0xa9, 0xcd, 0x26, 0x97, + 0x1f, 0x6b, 0x4f, 0x5e, 0x14, 0xb5, 0xa7, 0x2f, 0x8a, 0xda, 0x9f, 0x2f, 0x8a, 0xda, 0x8f, 0x2f, + 0x8b, 0x89, 0xa7, 0x2f, 0x8b, 0x89, 0xdf, 0x5e, 0x16, 0x13, 0x70, 0x81, 0xf2, 0x11, 0x37, 0x7f, + 0x39, 0x17, 0xfe, 0xfb, 0xd4, 0x90, 0x0b, 0x0d, 0xed, 0xcb, 0x4f, 0x4e, 0x20, 0x4d, 0xf0, 0xef, + 0x5e, 0x87, 0xb0, 0xbe, 0x3f, 0x1c, 0x5b, 0x69, 0xe5, 0xbc, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x25, 0x35, 0xe9, 0x7a, 0x99, 0x14, 0x00, 0x00, } func (m *ResourceMetrics) Marshal() (dAtA []byte, err error) { @@ -4958,7 +4958,7 @@ func (m *IntDataPoint) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Exemplars = append(m.Exemplars, &IntExemplar{}) + m.Exemplars = append(m.Exemplars, IntExemplar{}) if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5107,7 +5107,7 @@ func (m *DoubleDataPoint) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Exemplars = append(m.Exemplars, &DoubleExemplar{}) + m.Exemplars = append(m.Exemplars, DoubleExemplar{}) if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5371,7 +5371,7 @@ func (m *IntHistogramDataPoint) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Exemplars = append(m.Exemplars, &IntExemplar{}) + m.Exemplars = append(m.Exemplars, IntExemplar{}) if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5636,7 +5636,7 @@ func (m *DoubleHistogramDataPoint) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Exemplars = append(m.Exemplars, &DoubleExemplar{}) + m.Exemplars = append(m.Exemplars, DoubleExemplar{}) if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/internal/testdata/metric.go b/internal/testdata/metric.go index e8c5e8093f8..c77bca7d3d8 100644 --- a/internal/testdata/metric.go +++ b/internal/testdata/metric.go @@ -442,7 +442,7 @@ func generateOtlpDoubleHistogramMetric() *otlpmetrics.Metric { Sum: 15, BucketCounts: []uint64{0, 1}, ExplicitBounds: []float64{1}, - Exemplars: []*otlpmetrics.DoubleExemplar{ + Exemplars: []otlpmetrics.DoubleExemplar{ { FilteredLabels: generateOtlpMetricAttachment(), TimeUnixNano: uint64(TestMetricExemplarTimestamp), @@ -500,7 +500,7 @@ func generateOtlpIntHistogramMetric() *otlpmetrics.Metric { Sum: 15, BucketCounts: []uint64{0, 1}, ExplicitBounds: []float64{1}, - Exemplars: []*otlpmetrics.IntExemplar{ + Exemplars: []otlpmetrics.IntExemplar{ { FilteredLabels: generateOtlpMetricAttachment(), TimeUnixNano: uint64(TestMetricExemplarTimestamp), diff --git a/proto_patch.sed b/proto_patch.sed index d26656aea47..16cbc61ee31 100644 --- a/proto_patch.sed +++ b/proto_patch.sed @@ -38,3 +38,9 @@ s+opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = s+Status \(.*\);+Status \1\ [ (gogoproto.nullable) = false ];+g + +s+repeated IntExemplar exemplars = \(.*\);+repeated IntExemplar exemplars = \1\ + [ (gogoproto.nullable) = false ];+g + +s+repeated DoubleExemplar exemplars = \(.*\);+repeated DoubleExemplar exemplars = \1\ + [ (gogoproto.nullable) = false ];+g