Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions registry/servicediscovery/service_discovery_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ func (s *serviceDiscoveryRegistry) RegisterService() error {
func createInstance(meta *info.MetadataInfo, url *common.URL, registryId string) registry.ServiceInstance {
params := make(map[string]string, 8)
params[constant.MetadataStorageTypePropertyName] = metadata.GetMetadataType()
params[constant.TimestampKey] = strconv.FormatInt(time.Now().UnixMilli(), 10)
// Expose the registry this instance belongs to so that customizers (e.g. revision
// calculators) can scope their work to the correct per-registry service set.
params[constant.RegistryIdKey] = registryId
Expand Down
18 changes: 12 additions & 6 deletions registry/servicediscovery/service_discovery_registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"context"
"errors"
"fmt"
"strconv"
"sync"
"testing"
"time"
Expand Down Expand Up @@ -84,17 +85,22 @@ func TestServiceDiscoveryRegistryRegister(t *testing.T) {
sdReg, ok := reg.(*serviceDiscoveryRegistry)
assert.True(t, ok)

before := time.Now().UnixMilli()
err = sdReg.RegisterService()
after := time.Now().UnixMilli()
require.NoError(t, err)

assert.True(t, mockSD.registerCalled, "ServiceDiscovery.Register should be called")

if mockSD.capturedInstance != nil {
assert.Equal(t, testApp, mockSD.capturedInstance.GetServiceName())
assert.Equal(t, "127.0.0.1", mockSD.capturedInstance.GetHost())
assert.Equal(t, 20880, mockSD.capturedInstance.GetPort())
assert.Equal(t, "mock", mockSD.capturedInstance.GetMetadata()[constant.MetadataStorageTypePropertyName])
}
require.NotNil(t, mockSD.capturedInstance)
assert.Equal(t, testApp, mockSD.capturedInstance.GetServiceName())
assert.Equal(t, "127.0.0.1", mockSD.capturedInstance.GetHost())
assert.Equal(t, 20880, mockSD.capturedInstance.GetPort())
assert.Equal(t, "mock", mockSD.capturedInstance.GetMetadata()[constant.MetadataStorageTypePropertyName])
timestamp, err := strconv.ParseInt(mockSD.capturedInstance.GetMetadata()[constant.TimestampKey], 10, 64)
require.NoError(t, err)
assert.GreaterOrEqual(t, timestamp, before)
assert.LessOrEqual(t, timestamp, after)
}

// TestServiceDiscoveryRegistryRegisterPublishesMetadataOnce verifies that
Expand Down
Loading