fix: error message should not be set with other fields (#710)

* fix: error message should not be set with other fields

The server should just return the flag if the agent is unidentified
(service.name not known).

* add server log message

Author: rogercoll

extension/apmconfigextension/integration_test.go

@@ -113,10 +113,6 @@ func apmConfigintegrationTest(name string) func(t *testing.T) {
 							InstanceUid:  []byte("test"),
 							Capabilities: uint64(protobufs.ServerCapabilities_ServerCapabilities_OffersRemoteConfig),
 							Flags:        uint64(protobufs.ServerToAgentFlags_ServerToAgentFlags_ReportFullState),
-							ErrorResponse: &protobufs.ServerErrorResponse{
-								ErrorMessage: "error retrieving remote configuration: agent could not be identified: service.name attribute must be provided",
-								Type:         protobufs.ServerErrorResponseType_ServerErrorResponseType_Unknown,
-							},
 						},
 					},
 				},
@@ -266,10 +262,6 @@ func apmConfigintegrationTest(name string) func(t *testing.T) {
 							InstanceUid:  []byte("test-2"),
 							Capabilities: uint64(protobufs.ServerCapabilities_ServerCapabilities_OffersRemoteConfig),
 							Flags:        uint64(protobufs.ServerToAgentFlags_ServerToAgentFlags_ReportFullState),
-							ErrorResponse: &protobufs.ServerErrorResponse{
-								ErrorMessage: "error retrieving remote configuration: agent could not be identified: service.name attribute must be provided",
-								Type:         protobufs.ServerErrorResponseType_ServerErrorResponseType_Unknown,
-							},
 						},
 					},
 					{

extension/apmconfigextension/opamp_callbacks.go

@@ -155,9 +155,11 @@ func (rc *remoteConfigCallbacks) onMessage(ctx context.Context, conn types.Conne
 
 	remoteConfig, err := rc.configClient.RemoteConfig(ctx, loadedAgent.identifyingAttributes, loadedAgent.lastConfigHash)
 	if err != nil {
+		rc.logger.Error(fmt.Sprintf("error retrieving remote configuration: %s", err), agentUidField)
 		// remote config client could not identify the agent
 		if errors.Is(err, apmconfig.UnidentifiedAgent) {
 			serverToAgent.Flags = uint64(protobufs.ServerToAgentFlags_ServerToAgentFlags_ReportFullState)
+			return &serverToAgent
 		}
 		return rc.serverError(fmt.Sprintf("error retrieving remote configuration: %s", err), &serverToAgent)
 	} else if remoteConfig == nil {

extension/apmconfigextension/opamp_callbacks_test.go

@@ -104,10 +104,6 @@ func TestOnMessage(t *testing.T) {
 						InstanceUid:  []byte("test"),
 						Capabilities: uint64(protobufs.ServerCapabilities_ServerCapabilities_OffersRemoteConfig),
 						Flags:        uint64(protobufs.ServerToAgentFlags_ServerToAgentFlags_ReportFullState),
-						ErrorResponse: &protobufs.ServerErrorResponse{
-							ErrorMessage: "error retrieving remote configuration: agent could not be identified",
-							Type:         protobufs.ServerErrorResponseType_ServerErrorResponseType_Unknown,
-						},
 					},
 				},
 			},