Refactor

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 🛑 Breaking changes 🛑
+
+- **Update OTLP to v0.5.0, incompatible metrics protocol.**
+- Remove support for propagating summary metrics in OtelCollector.
+  - This is a temporary change, and will affect mostly OpenCensus users who use metrics.
+
 ## v0.9.0 Beta
 
 ## 🛑 Breaking changes 🛑

cmd/pdatagen/internal/base_fields.go

@@ -103,7 +103,7 @@ type baseField interface {
 }
 
 type sliceField struct {
-	fieldMame       string
+	fieldName       string
 	originFieldName string
 	returnSlice     *sliceStruct
 }
@@ -114,7 +114,7 @@ func (sf *sliceField) generateAccessors(ms *messageStruct, sb *strings.Builder)
 		case "structName":
 			return ms.structName
 		case "fieldName":
-			return sf.fieldMame
+			return sf.fieldName
 		case "returnType":
 			return sf.returnSlice.structName
 		case "originFieldName":
@@ -131,7 +131,7 @@ func (sf *sliceField) generateAccessorsTest(ms *messageStruct, sb *strings.Build
 		case "structName":
 			return ms.structName
 		case "fieldName":
-			return sf.fieldMame
+			return sf.fieldName
 		case "returnType":
 			return sf.returnSlice.structName
 		default:
@@ -141,11 +141,11 @@ func (sf *sliceField) generateAccessorsTest(ms *messageStruct, sb *strings.Build
 }
 
 func (sf *sliceField) generateSetWithTestValue(sb *strings.Builder) {
-	sb.WriteString("\tfillTest" + sf.returnSlice.structName + "(tv." + sf.fieldMame + "())")
+	sb.WriteString("\tfillTest" + sf.returnSlice.structName + "(tv." + sf.fieldName + "())")
 }
 
 func (sf *sliceField) generateCopyToValue(sb *strings.Builder) {
-	sb.WriteString("\tms." + sf.fieldMame + "().CopyTo(dest." + sf.fieldMame + "())")
+	sb.WriteString("\tms." + sf.fieldName + "().CopyTo(dest." + sf.fieldName + "())")
 }
 
 var _ baseField = (*sliceField)(nil)
@@ -204,7 +204,7 @@ func (mf *messageField) generateCopyToValue(sb *strings.Builder) {
 var _ baseField = (*messageField)(nil)
 
 type primitiveField struct {
-	fieldMame       string
+	fieldName       string
 	originFieldName string
 	returnType      string
 	defaultVal      string
@@ -217,9 +217,9 @@ func (pf *primitiveField) generateAccessors(ms *messageStruct, sb *strings.Build
 		case "structName":
 			return ms.structName
 		case "fieldName":
-			return pf.fieldMame
+			return pf.fieldName
 		case "lowerFieldName":
-			return strings.ToLower(pf.fieldMame)
+			return strings.ToLower(pf.fieldName)
 		case "returnType":
 			return pf.returnType
 		case "originFieldName":
@@ -238,7 +238,7 @@ func (pf *primitiveField) generateAccessorsTest(ms *messageStruct, sb *strings.B
 		case "defaultVal":
 			return pf.defaultVal
 		case "fieldName":
-			return pf.fieldMame
+			return pf.fieldName
 		case "testValue":
 			return pf.testVal
 		default:
@@ -248,18 +248,18 @@ func (pf *primitiveField) generateAccessorsTest(ms *messageStruct, sb *strings.B
 }
 
 func (pf *primitiveField) generateSetWithTestValue(sb *strings.Builder) {
-	sb.WriteString("\ttv.Set" + pf.fieldMame + "(" + pf.testVal + ")")
+	sb.WriteString("\ttv.Set" + pf.fieldName + "(" + pf.testVal + ")")
 }
 
 func (pf *primitiveField) generateCopyToValue(sb *strings.Builder) {
-	sb.WriteString("\tdest.Set" + pf.fieldMame + "(ms." + pf.fieldMame + "())")
+	sb.WriteString("\tdest.Set" + pf.fieldName + "(ms." + pf.fieldName + "())")
 }
 
 var _ baseField = (*primitiveField)(nil)
 
 // Types that has defined a custom type (e.g. "type TimestampUnixNano uint64")
 type primitiveTypedField struct {
-	fieldMame       string
+	fieldName       string
 	originFieldName string
 	returnType      string
 	defaultVal      string
@@ -273,9 +273,9 @@ func (ptf *primitiveTypedField) generateAccessors(ms *messageStruct, sb *strings
 		case "structName":
 			return ms.structName
 		case "fieldName":
-			return ptf.fieldMame
+			return ptf.fieldName
 		case "lowerFieldName":
-			return strings.ToLower(ptf.fieldMame)
+			return strings.ToLower(ptf.fieldName)
 		case "returnType":
 			return ptf.returnType
 		case "rawType":
@@ -296,7 +296,7 @@ func (ptf *primitiveTypedField) generateAccessorsTest(ms *messageStruct, sb *str
 		case "defaultVal":
 			return ptf.defaultVal
 		case "fieldName":
-			return ptf.fieldMame
+			return ptf.fieldName
 		case "testValue":
 			return ptf.testVal
 		default:
@@ -306,11 +306,35 @@ func (ptf *primitiveTypedField) generateAccessorsTest(ms *messageStruct, sb *str
 }
 
 func (ptf *primitiveTypedField) generateSetWithTestValue(sb *strings.Builder) {
-	sb.WriteString("\ttv.Set" + ptf.fieldMame + "(" + ptf.testVal + ")")
+	sb.WriteString("\ttv.Set" + ptf.fieldName + "(" + ptf.testVal + ")")
 }
 
 func (ptf *primitiveTypedField) generateCopyToValue(sb *strings.Builder) {
-	sb.WriteString("\tdest.Set" + ptf.fieldMame + "(ms." + ptf.fieldMame + "())")
+	sb.WriteString("\tdest.Set" + ptf.fieldName + "(ms." + ptf.fieldName + "())")
 }
 
 var _ baseField = (*primitiveTypedField)(nil)
+
+// oneofField is used in case where the proto defines an "oneof".
+type oneofField struct {
+	copyFuncName    string
+	originFieldName string
+	testVal         string
+	fillTestName    string
+}
+
+func (one oneofField) generateAccessors(*messageStruct, *strings.Builder) {}
+
+func (one oneofField) generateAccessorsTest(*messageStruct, *strings.Builder) {}
+
+func (one oneofField) generateSetWithTestValue(sb *strings.Builder) {
+	sb.WriteString("\t(*tv.orig)." + one.originFieldName + " = " + one.testVal + "\n")
+	sb.WriteString("\ttv." + one.fillTestName + "().InitEmpty()\n")
+	sb.WriteString("\tfillTest" + one.fillTestName + "(tv." + one.fillTestName + "())")
+}
+
+func (one oneofField) generateCopyToValue(sb *strings.Builder) {
+	sb.WriteString("\t" + one.copyFuncName + "((*ms.orig), (*dest.orig))")
+}
+
+var _ baseField = (*oneofField)(nil)

cmd/pdatagen/internal/common_structs.go

@@ -39,7 +39,7 @@ var instrumentationLibrary = &messageStruct{
 	fields: []baseField{
 		nameField,
 		&primitiveField{
-			fieldMame:       "Version",
+			fieldName:       "Version",
 			originFieldName: "Version",
 			returnType:      "string",
 			defaultVal:      `""`,
@@ -73,7 +73,7 @@ var instrumentationLibraryField = &messageField{
 }
 
 var startTimeField = &primitiveTypedField{
-	fieldMame:       "StartTime",
+	fieldName:       "StartTime",
 	originFieldName: "StartTimeUnixNano",
 	returnType:      "TimestampUnixNano",
 	rawType:         "uint64",
@@ -82,7 +82,7 @@ var startTimeField = &primitiveTypedField{
 }
 
 var timeField = &primitiveTypedField{
-	fieldMame:       "Timestamp",
+	fieldName:       "Timestamp",
 	originFieldName: "TimeUnixNano",
 	returnType:      "TimestampUnixNano",
 	rawType:         "uint64",
@@ -91,7 +91,7 @@ var timeField = &primitiveTypedField{
 }
 
 var endTimeField = &primitiveTypedField{
-	fieldMame:       "EndTime",
+	fieldName:       "EndTime",
 	originFieldName: "EndTimeUnixNano",
 	returnType:      "TimestampUnixNano",
 	rawType:         "uint64",
@@ -100,13 +100,13 @@ var endTimeField = &primitiveTypedField{
 }
 
 var attributes = &sliceField{
-	fieldMame:       "Attributes",
+	fieldName:       "Attributes",
 	originFieldName: "Attributes",
 	returnSlice:     attributeMap,
 }
 
 var nameField = &primitiveField{
-	fieldMame:       "Name",
+	fieldName:       "Name",
 	originFieldName: "Name",
 	returnType:      "string",
 	defaultVal:      `""`,

cmd/pdatagen/internal/log_structs.go

@@ -48,7 +48,7 @@ var resourceLogs = &messageStruct{
 	fields: []baseField{
 		resourceField,
 		&sliceField{
-			fieldMame:       "InstrumentationLibraryLogs",
+			fieldName:       "InstrumentationLibraryLogs",
 			originFieldName: "InstrumentationLibraryLogs",
 			returnSlice:     instrumentationLibraryLogsSlice,
 		},
@@ -67,7 +67,7 @@ var instrumentationLibraryLogs = &messageStruct{
 	fields: []baseField{
 		instrumentationLibraryField,
 		&sliceField{
-			fieldMame:       "Logs",
+			fieldName:       "Logs",
 			originFieldName: "Logs",
 			returnSlice:     logSlice,
 		},
@@ -85,7 +85,7 @@ var logRecord = &messageStruct{
 	originFullName: "otlplogs.LogRecord",
 	fields: []baseField{
 		&primitiveTypedField{
-			fieldMame:       "Timestamp",
+			fieldName:       "Timestamp",
 			originFieldName: "TimeUnixNano",
 			returnType:      "TimestampUnixNano",
 			rawType:         "uint64",
@@ -95,30 +95,30 @@ var logRecord = &messageStruct{
 		traceIDField,
 		spanIDField,
 		&primitiveTypedField{
-			fieldMame:       "Flags",
+			fieldName:       "Flags",
 			originFieldName: "Flags",
 			returnType:      "uint32",
 			rawType:         "uint32",
 			defaultVal:      `uint32(0)`,
 			testVal:         `uint32(0x01)`,
 		},
 		&primitiveField{
-			fieldMame:       "SeverityText",
+			fieldName:       "SeverityText",
 			originFieldName: "SeverityText",
 			returnType:      "string",
 			defaultVal:      `""`,
 			testVal:         `"INFO"`,
 		},
 		&primitiveTypedField{
-			fieldMame:       "SeverityNumber",
+			fieldName:       "SeverityNumber",
 			originFieldName: "SeverityNumber",
 			returnType:      "SeverityNumber",
 			rawType:         "otlplogs.SeverityNumber",
 			defaultVal:      `SeverityNumberUNDEFINED`,
 			testVal:         `SeverityNumberINFO`,
 		},
 		&primitiveField{
-			fieldMame:       "Name",
+			fieldName:       "Name",
 			originFieldName: "Name",
 			returnType:      "string",
 			defaultVal:      `""`,