Merge pull request #1105 from amvanbaren/trace-unpkg-asset

Observe /vscode/unpkg and /vscode/asset requests

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/adapter/LocalVSCodeService.java

@@ -10,6 +10,7 @@
 package org.eclipse.openvsx.adapter;
 
 import com.google.common.collect.Lists;
+import io.micrometer.observation.annotation.Observed;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.openvsx.cache.CacheService;
 import org.eclipse.openvsx.entities.Extension;
@@ -273,6 +274,7 @@ private String getSortOrder(int sortOrder) {
         }
     }
 
+    @Observed
     @Override
     public ResponseEntity<StreamingResponseBody> getAsset(
             String namespace, String extensionName, String version, String assetType, String targetPlatform,
@@ -392,6 +394,7 @@ public String download(String namespaceName, String extensionName, String versio
         }
     }
 
+    @Observed
     @Override
     public ResponseEntity<StreamingResponseBody> browse(String namespaceName, String extensionName, String version, String path) {
         if(BuiltInExtensionUtil.isBuiltIn(namespaceName)) {

server/src/main/java/org/eclipse/openvsx/adapter/VSCodeAPI.java

@@ -9,6 +9,7 @@
  ********************************************************************************/
 package org.eclipse.openvsx.adapter;
 
+import io.micrometer.observation.annotation.Observed;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.headers.Header;
@@ -87,6 +88,7 @@ public ExtensionQueryResult extensionQuery(@RequestBody @Parameter(description =
         return extensionQueryRequestHandler.getResult(param, size, DEFAULT_PAGE_SIZE);
     }
 
+    @Observed
     @GetMapping("/vscode/asset/{namespaceName}/{extensionName}/{version}/{assetType}/**")
     @CrossOrigin
     @Operation(summary = "Access an extension asset")
@@ -258,6 +260,7 @@ public ModelAndView download(
         return new ModelAndView(null, HttpStatus.NOT_FOUND);
     }
 
+    @Observed
     @GetMapping("/vscode/unpkg/{namespaceName}/{extensionName}/{version}/**")
     @CrossOrigin
     @Operation(summary = "Browse an extension package")

server/src/main/java/org/eclipse/openvsx/adapter/WebResourceService.java

@@ -10,6 +10,7 @@
 package org.eclipse.openvsx.adapter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.annotation.Observed;
 import org.eclipse.openvsx.cache.CacheService;
 import org.eclipse.openvsx.cache.FilesCacheKeyGenerator;
 import org.eclipse.openvsx.entities.FileResource;
@@ -56,6 +57,7 @@ public WebResourceService(
         this.filesCacheKeyGenerator = filesCacheKeyGenerator;
     }
 
+    @Observed
     @Cacheable(value = CACHE_WEB_RESOURCE_FILES, keyGenerator = GENERATOR_FILES)
     public Path getWebResource(String namespace, String extension, String targetPlatform, String version, String name, boolean browse) {
         var download = repositories.findFileByType(namespace, extension, targetPlatform, version, FileResource.DOWNLOAD);

server/src/main/java/org/eclipse/openvsx/cache/CacheService.java

@@ -9,6 +9,7 @@
  * ****************************************************************************** */
 package org.eclipse.openvsx.cache;
 
+import io.micrometer.observation.annotation.Observed;
 import org.eclipse.openvsx.entities.*;
 import org.eclipse.openvsx.repositories.RepositoryService;
 import org.eclipse.openvsx.util.TargetPlatform;
@@ -176,6 +177,7 @@ public void evictExtensionFile(FileResource download) {
         cache.evict(filesCacheKeyGenerator.generate(download));
     }
 
+    @Observed
     public void evictWebResourceFile(String namespaceName, String extensionName, String targetPlatform, String version, String path) {
         var cache = cacheManager.getCache(CACHE_WEB_RESOURCE_FILES);
         if(cache == null) {

server/src/main/java/org/eclipse/openvsx/metrics/MetricsConfiguration.java

@@ -21,7 +21,7 @@
 @Configuration
 @Profile("!test")
 public class MetricsConfiguration {
-    //@Bean
+    @Bean
     public ObservedAspect observedAspect(ObservationRegistry observationRegistry) {
         return new ObservedAspect(observationRegistry, new RegistryObservationConvention());
     }