Merge pull request #894 from amvanbaren/observe-namespace-details

amvanbaren · web-flow · commit 83de5d9c246a · 2024-04-17T11:14:18.000+03:00
Observe namespace details
diff --git a/server/src/main/java/org/eclipse/openvsx/IExtensionRegistry.java b/server/src/main/java/org/eclipse/openvsx/IExtensionRegistry.java
@@ -21,10 +21,8 @@ public interface IExtensionRegistry {
 
     NamespaceJson getNamespace(String namespace);
 
-    @Observed
     ExtensionJson getExtension(String namespace, String extensionName, String targetPlatform);
 
-    @Observed
     ExtensionJson getExtension(String namespace, String extensionName, String targetPlatform, String version);
 
     VersionsJson getVersions(String namespace, String extension, String targetPlatform, int size, int offset);
@@ -41,6 +39,7 @@ public interface IExtensionRegistry {
 
     QueryResultJson queryV2(QueryRequestV2 request);
 
+    @Observed
     NamespaceDetailsJson getNamespaceDetails(String namespace);
 
     ResponseEntity<byte[]> getNamespaceLogo(String namespaceName, String fileName);
diff --git a/server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java b/server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java
@@ -107,14 +107,12 @@ public NamespaceJson getNamespace(String namespaceName) {
     }
 
     @Override
-    @Observed
     @Cacheable(value = CACHE_EXTENSION_JSON, keyGenerator = GENERATOR_EXTENSION_JSON)
     public ExtensionJson getExtension(String namespace, String extensionName, String targetPlatform) {
         return getExtension(namespace, extensionName, targetPlatform, VersionAlias.LATEST);
     }
 
     @Override
-    @Observed
     @Cacheable(value = CACHE_EXTENSION_JSON, keyGenerator = GENERATOR_EXTENSION_JSON)
     public ExtensionJson getExtension(String namespace, String extensionName, String targetPlatform, String version) {
         var extVersion = findExtensionVersion(namespace, extensionName, targetPlatform, version);
@@ -384,6 +382,7 @@ public QueryResultJson queryV2(QueryRequestV2 request) {
     @Override
     @Transactional
     @Cacheable(CACHE_NAMESPACE_DETAILS_JSON)
+    @Observed
     public NamespaceDetailsJson getNamespaceDetails(String namespaceName) {
         var namespace = repositories.findNamespace(namespaceName);
         if (namespace == null) {
diff --git a/server/src/main/java/org/eclipse/openvsx/RegistryAPI.java b/server/src/main/java/org/eclipse/openvsx/RegistryAPI.java
@@ -176,6 +176,7 @@ public ResponseEntity<ResultJson> verifyToken(
     @CrossOrigin
     @Operation()
     @ApiResponses({})
+    @Observed
     public ResponseEntity<NamespaceDetailsJson> getNamespaceDetails(
             @PathVariable @Parameter(description = "Namespace name", example = "redhat")
             String namespace
@@ -279,7 +280,6 @@ public ResponseEntity<ExtensionJson> getExtension(
         return new ResponseEntity<>(json, HttpStatus.NOT_FOUND);
     }
 
-    @Observed
     @GetMapping(
         path = "/api/{namespace}/{extension}/{targetPlatform:" + TargetPlatform.NAMES_PATH_PARAM_REGEX + "}",
         produces = MediaType.APPLICATION_JSON_VALUE
@@ -401,7 +401,6 @@ public ResponseEntity<ExtensionJson> getExtension(
         return new ResponseEntity<>(json, HttpStatus.NOT_FOUND);
     }
 
-    @Observed
     @GetMapping(
         path = "/api/{namespace}/{extension}/{targetPlatform:" + TargetPlatform.NAMES_PATH_PARAM_REGEX + "}/{version:" + VERSION_PATH_PARAM_REGEX + "}",
         produces = MediaType.APPLICATION_JSON_VALUE
diff --git a/server/src/main/java/org/eclipse/openvsx/UpstreamRegistryService.java b/server/src/main/java/org/eclipse/openvsx/UpstreamRegistryService.java
@@ -68,6 +68,7 @@ public NamespaceJson getNamespace(String namespace) {
     }
 
     @Override
+    @Observed
     public NamespaceDetailsJson getNamespaceDetails(String namespace) {
         var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/details";
         var uriVariables = Map.of("namespace", namespace);
@@ -87,7 +88,6 @@ public ResponseEntity<byte[]> getNamespaceLogo(String namespaceName, String file
     }
 
     @Override
-    @Observed
     public ExtensionJson getExtension(String namespace, String extension, String targetPlatform) {
         var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/{extension}";
         var uriVariables = new HashMap<String, String>();
@@ -112,7 +112,6 @@ public ExtensionJson getExtension(String namespace, String extension, String tar
     }
 
     @Override
-    @Observed
     public ExtensionJson getExtension(String namespace, String extension, String targetPlatform, String version) {
         var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/{extension}";
         var uriVariables = new HashMap<String, String>();
diff --git a/server/src/main/java/org/eclipse/openvsx/cache/ExtensionJsonCacheKeyGenerator.java b/server/src/main/java/org/eclipse/openvsx/cache/ExtensionJsonCacheKeyGenerator.java
@@ -20,13 +20,11 @@
 @Component
 public class ExtensionJsonCacheKeyGenerator implements KeyGenerator {
     @Override
-    @Observed
     public Object generate(Object target, Method method, Object... params) {
         var version = params.length == 4 ? (String) params[3] : VersionAlias.LATEST;
         return generate((String) params[0], (String) params[1], (String) params[2], version);
     }
 
-    @Observed
     public String generate(String namespaceName, String extensionName, String targetPlatform, String version) {
         return NamingUtil.toFileFormat(namespaceName, extensionName, version, targetPlatform);
     }
diff --git a/server/src/main/java/org/eclipse/openvsx/cache/LatestExtensionVersionCacheKeyGenerator.java b/server/src/main/java/org/eclipse/openvsx/cache/LatestExtensionVersionCacheKeyGenerator.java
@@ -23,7 +23,6 @@
 @Component
 public class LatestExtensionVersionCacheKeyGenerator implements KeyGenerator {
     @Override
-    @Observed
     public Object generate(Object target, Method method, Object... params) {
         Extension extension;
         String targetPlatform;
@@ -51,7 +50,6 @@ public Object generate(Object target, Method method, Object... params) {
         return generate(extension, targetPlatform, preRelease, onlyActive, type);
     }
 
-    @Observed
     public String generate(Extension extension, String targetPlatform, boolean preRelease, boolean onlyActive, ExtensionVersion.Type type) {
         var extensionName = extension.getName();
         var namespaceName = extension.getNamespace().getName();
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionRepository.java
@@ -26,11 +26,11 @@ public interface ExtensionRepository extends Repository<Extension, Long> {
 
     Streamable<Extension> findByNamespace(Namespace namespace);
 
+    @Observed
     Streamable<Extension> findByNamespaceAndActiveTrueOrderByNameAsc(Namespace namespace);
 
     Extension findByNameIgnoreCaseAndNamespace(String name, Namespace namespace);
 
-    @Observed
     Extension findByNameIgnoreCaseAndNamespaceNameIgnoreCase(String name, String namespace);
 
     Extension findByPublicId(String publicId);
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java
@@ -229,7 +229,6 @@ public List<ExtensionVersion> findActiveVersionReferencesSorted(Collection<Exten
                 .collect(Collectors.toList());
     }
 
-    @Observed
     public List<String> findVersionStringsSorted(Long extensionId, String targetPlatform, boolean onlyActive, int numberOfRows) {
         var conditions = new ArrayList<Condition>();
         conditions.add(EXTENSION_VERSION.EXTENSION_ID.eq(extensionId));
@@ -581,7 +580,6 @@ public List<VersionTargetPlatformsJson> findTargetPlatformsGroupedByVersion(Exte
                 ));
     }
 
-    @Observed
     public List<ExtensionVersion> findVersionsForUrls(Extension extension, String targetPlatform, String version) {
         var query = dsl.selectQuery();
         query.addSelect(
@@ -609,6 +607,7 @@ public List<ExtensionVersion> findVersionsForUrls(Extension extension, String ta
                 });
     }
 
+    @Observed
     public ExtensionVersion findLatest(
             Extension extension,
             String targetPlatform,
@@ -657,7 +656,6 @@ public ExtensionVersion findLatest(
         return query.fetchOne((record) -> toExtensionVersionFull(record, extension));
     }
 
-    @Observed
     public ExtensionVersion findLatestForAllUrls(
             Extension extension,
             String targetPlatform,
@@ -715,7 +713,6 @@ private SelectQuery<Record> findLatestQuery(
         return query;
     }
 
-    @Observed
     public ExtensionVersion find(String namespaceName, String extensionName, String targetPlatform, String version) {
         var onlyPreRelease = VersionAlias.PRE_RELEASE.equals(version);
         var query = findLatestQuery(targetPlatform, onlyPreRelease, true);
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/FileResourceJooqRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/FileResourceJooqRepository.java
@@ -31,7 +31,6 @@ public class FileResourceJooqRepository {
     @Autowired
     DSLContext dsl;
 
-    @Observed
     public List<FileResource> findByType(Collection<ExtensionVersion> extVersions, Collection<String> types) {
         if(extVersions.isEmpty() || types.isEmpty()) {
             return Collections.emptyList();
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceMembershipJooqRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceMembershipJooqRepository.java
@@ -58,7 +58,6 @@ private NamespaceMembership toNamespaceMembership(Record record) {
         return namespaceMembership;
     }
 
-    @Observed
     public boolean isVerified(Namespace namespace, UserData user) {
         var nm = NAMESPACE_MEMBERSHIP.as("nm");
         var onm = NAMESPACE_MEMBERSHIP.as("onm");
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceMembershipRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceMembershipRepository.java
@@ -9,6 +9,7 @@
  ********************************************************************************/
 package org.eclipse.openvsx.repositories;
 
+import io.micrometer.observation.annotation.Observed;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.util.Streamable;
 import org.eclipse.openvsx.entities.Namespace;
@@ -23,6 +24,7 @@ public interface NamespaceMembershipRepository extends Repository<NamespaceMembe
 
     Streamable<NamespaceMembership> findByNamespaceAndRoleIgnoreCase(Namespace namespace, String role);
 
+    @Observed
     long countByNamespaceAndRoleIgnoreCase(Namespace namespace, String role);
 
     Streamable<NamespaceMembership> findByNamespace(Namespace namespace);
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/NamespaceRepository.java
@@ -9,6 +9,7 @@
  ********************************************************************************/
 package org.eclipse.openvsx.repositories;
 
+import io.micrometer.observation.annotation.Observed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.util.Streamable;
@@ -18,6 +19,7 @@
 
 public interface NamespaceRepository extends Repository<Namespace, Long> {
 
+    @Observed
     Namespace findByNameIgnoreCase(String name);
 
     Namespace findByPublicId(String publicId);
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java b/server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java
@@ -60,6 +60,7 @@ public class RepositoryService {
     @Autowired MigrationItemRepository migrationItemRepo;
     @Autowired SignatureKeyPairRepository signatureKeyPairRepo;
 
+    @Observed
     public Namespace findNamespace(String name) {
         return namespaceRepo.findByNameIgnoreCase(name);
     }
@@ -80,7 +81,6 @@ public Extension findExtension(String name, Namespace namespace) {
         return extensionRepo.findByNameIgnoreCaseAndNamespace(name, namespace);
     }
 
-    @Observed
     public Extension findExtension(String name, String namespace) {
         return extensionRepo.findByNameIgnoreCaseAndNamespaceNameIgnoreCase(name, namespace);
     }
@@ -89,6 +89,7 @@ public Extension findExtensionByPublicId(String publicId) {
         return extensionRepo.findByPublicId(publicId);
     }
 
+    @Observed
     public Streamable<Extension> findActiveExtensions(Namespace namespace) {
         return extensionRepo.findByNamespaceAndActiveTrueOrderByNameAsc(namespace);
     }
@@ -157,7 +158,6 @@ public Page<String> findActiveVersionStringsSorted(String namespace, String exte
         return extensionVersionJooqRepo.findActiveVersionStringsSorted(namespace, extension, targetPlatform, page);
     }
 
-    @Observed
     public List<String> findVersionStringsSorted(Extension extension, String targetPlatform, boolean onlyActive) {
         return extensionVersionJooqRepo.findVersionStringsSorted(extension.getId(), targetPlatform, onlyActive, MAX_VERSIONS);
     }
@@ -222,7 +222,6 @@ public FileResource findFileByType(ExtensionVersion extVersion, String type) {
         return fileResourceRepo.findByExtensionAndType(extVersion, type);
     }
 
-    @Observed
     public List<FileResource> findFilesByType(Collection<ExtensionVersion> extVersions, Collection<String> types) {
         return fileResourceJooqRepo.findByType(extVersions, types);
     }
@@ -263,7 +262,6 @@ public NamespaceMembership findMembership(UserData user, Namespace namespace) {
         return membershipRepo.findByUserAndNamespace(user, namespace);
     }
 
-    @Observed
     public boolean isVerified(Namespace namespace, UserData user) {
         return membershipJooqRepo.isVerified(namespace, user);
     }
@@ -272,6 +270,7 @@ public Streamable<NamespaceMembership> findMemberships(Namespace namespace, Stri
         return membershipRepo.findByNamespaceAndRoleIgnoreCase(namespace, role);
     }
 
+    @Observed
     public long countMemberships(Namespace namespace, String role) {
         return membershipRepo.countByNamespaceAndRoleIgnoreCase(namespace, role);
     }
@@ -533,21 +532,19 @@ public List<VersionTargetPlatformsJson> findTargetPlatformsGroupedByVersion(Exte
         return extensionVersionJooqRepo.findTargetPlatformsGroupedByVersion(extension);
     }
 
-    @Observed
     public List<ExtensionVersion> findVersionsForUrls(Extension extension, String targetPlatform, String version) {
         return extensionVersionJooqRepo.findVersionsForUrls(extension, targetPlatform, version);
     }
 
-    @Observed
     public ExtensionVersion findExtensionVersion(String namespace, String extension, String targetPlatform, String version) {
         return extensionVersionJooqRepo.find(namespace, extension, targetPlatform, version);
     }
 
-    @Observed
     public ExtensionVersion findLatestVersionForAllUrls(Extension extension, String targetPlatform, boolean onlyPreRelease, boolean onlyActive) {
         return extensionVersionJooqRepo.findLatestForAllUrls(extension, targetPlatform, onlyPreRelease, onlyActive);
     }
 
+    @Observed
     public ExtensionVersion findLatestVersion(Extension extension, String targetPlatform, boolean onlyPreRelease, boolean onlyActive) {
         return extensionVersionJooqRepo.findLatest(extension, targetPlatform, onlyPreRelease, onlyActive);
     }
diff --git a/server/src/main/java/org/eclipse/openvsx/storage/AzureBlobStorageService.java b/server/src/main/java/org/eclipse/openvsx/storage/AzureBlobStorageService.java
@@ -16,6 +16,7 @@
 import com.azure.storage.blob.models.BlobHttpHeaders;
 import com.azure.storage.blob.models.BlobStorageException;
 import com.azure.storage.blob.models.CopyStatusType;
+import io.micrometer.observation.annotation.Observed;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.openvsx.entities.FileResource;
@@ -181,6 +182,7 @@ protected String getBlobName(FileResource resource) {
     }
 
     @Override
+    @Observed
     public URI getNamespaceLogoLocation(Namespace namespace) {
         var blobName = getBlobName(namespace);
         if (StringUtils.isEmpty(serviceEndpoint)) {
diff --git a/server/src/main/java/org/eclipse/openvsx/storage/GoogleCloudStorageService.java b/server/src/main/java/org/eclipse/openvsx/storage/GoogleCloudStorageService.java
@@ -13,6 +13,7 @@
 import com.google.cloud.storage.BlobInfo;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
+import io.micrometer.observation.annotation.Observed;
 import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.openvsx.entities.FileResource;
 import org.eclipse.openvsx.entities.Namespace;
@@ -176,6 +177,7 @@ protected String getObjectId(FileResource resource) {
     }
 
     @Override
+    @Observed
     public URI getNamespaceLogoLocation(Namespace namespace) {
         if (StringUtils.isEmpty(bucketId)) {
             throw new IllegalStateException("Cannot determine location of file "
diff --git a/server/src/main/java/org/eclipse/openvsx/storage/StorageUtilService.java b/server/src/main/java/org/eclipse/openvsx/storage/StorageUtilService.java
@@ -210,6 +210,7 @@ public URI getLocation(FileResource resource) {
     }
 
     @Override
+    @Observed
     public URI getNamespaceLogoLocation(Namespace namespace) {
         switch (namespace.getLogoStorageType()) {
             case STORAGE_GOOGLE:
@@ -250,6 +251,7 @@ private String getFileUrl(String name, ExtensionVersion extVersion, String serve
         return UrlUtil.createApiFileUrl(serverUrl, extVersion, name);
     }
 
+    @Observed
     public Map<String, String> getFileUrls(ExtensionVersion extVersion, String serverUrl, String... types) {
         var fileUrls = getFileUrls(List.of(extVersion), serverUrl, types);
         return fileUrls.get(extVersion.getId());
@@ -258,7 +260,6 @@ public Map<String, String> getFileUrls(ExtensionVersion extVersion, String serve
     /**
      * Returns URLs for the given file types as a map of ExtensionVersion.id by a map of type by file URL, to be used in JSON response data.
      */
-    @Observed
     public Map<Long, Map<String, String>> getFileUrls(Collection<ExtensionVersion> extVersions, String serverUrl, String... types) {
         var type2Url = extVersions.stream()
                 .map(ev -> new AbstractMap.SimpleEntry<Long, Map<String, String>>(ev.getId(), Maps.newLinkedHashMapWithExpectedSize(types.length)))

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public NamespaceJson getNamespace(String namespace) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
	`71`	`+ @Observed`
`71`	`72`	`public NamespaceDetailsJson getNamespaceDetails(String namespace) {`
`72`	`73`	`var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/details";`
`73`	`74`	`var uriVariables = Map.of("namespace", namespace);`
`@@ -87,7 +88,6 @@ public ResponseEntity<byte[]> getNamespaceLogo(String namespaceName, String file`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`@Override`
`90`		`- @Observed`
`91`	`91`	`public ExtensionJson getExtension(String namespace, String extension, String targetPlatform) {`
`92`	`92`	`var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/{extension}";`
`93`	`93`	`var uriVariables = new HashMap<String, String>();`
`@@ -112,7 +112,6 @@ public ExtensionJson getExtension(String namespace, String extension, String tar`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`		`- @Observed`
`116`	`115`	`public ExtensionJson getExtension(String namespace, String extension, String targetPlatform, String version) {`
`117`	`116`	`var urlTemplate = urlConfigService.getUpstreamUrl() + "/api/{namespace}/{extension}";`
`118`	`117`	`var uriVariables = new HashMap<String, String>();`
Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,11 @@`
`20`	`20`	`@Component`
`21`	`21`	`public class ExtensionJsonCacheKeyGenerator implements KeyGenerator {`
`22`	`22`	`@Override`
`23`		`- @Observed`
`24`	`23`	`public Object generate(Object target, Method method, Object... params) {`
`25`	`24`	`var version = params.length == 4 ? (String) params[3] : VersionAlias.LATEST;`
`26`	`25`	`return generate((String) params[0], (String) params[1], (String) params[2], version);`
`27`	`26`	`}`
`28`	`27`
`29`		`- @Observed`
`30`	`28`	`public String generate(String namespaceName, String extensionName, String targetPlatform, String version) {`
`31`	`29`	`return NamingUtil.toFileFormat(namespaceName, extensionName, version, targetPlatform);`
`32`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ private NamespaceMembership toNamespaceMembership(Record record) {`
`58`	`58`	`return namespaceMembership;`
`59`	`59`	`}`
`60`	`60`
`61`		`- @Observed`
`62`	`61`	`public boolean isVerified(Namespace namespace, UserData user) {`
`63`	`62`	`var nm = NAMESPACE_MEMBERSHIP.as("nm");`
`64`	`63`	`var onm = NAMESPACE_MEMBERSHIP.as("onm");`