feat!: Update cloud-spanner to minimum Node version of 22 #9291
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,3 +35,16 @@ export enum ValueType { | |
| DOUBLE = 'DOUBLE', | ||
| DISTRIBUTION = 'DISTRIBUTION', | ||
| } | ||
|
|
||
| /** | ||
| * A Google Cloud Monitoring monitored resource. | ||
| * | ||
| * Previously imported from `@google-cloud/opentelemetry-resource-util`, which is | ||
| * deprecated and scheduled for archival. The interface is a plain data shape, so | ||
| * it is declared locally instead. | ||
| * See https://cloud.google.com/monitoring/api/ref_v3/rest/v3/MonitoredResource | ||
| */ | ||
| export interface MonitoredResource { | ||
| type: string; | ||
| labels: {[key: string]: string}; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,11 @@ import * as os from 'os'; | |
| import * as process from 'process'; | ||
| import {MeterProvider, MetricReader} from '@opentelemetry/sdk-metrics'; | ||
| import {Counter, Histogram, context, ROOT_CONTEXT} from '@opentelemetry/api'; | ||
| import { | ||
| detectResources, | ||
| resourceFromAttributes, | ||
| } from '@opentelemetry/resources'; | ||
| import {gcpDetector} from '@opentelemetry/resource-detector-gcp'; | ||
| import * as Constants from './constants'; | ||
| import {MetricsTracer} from './metrics-tracer'; | ||
| const version = require('../../../package.json').version; | ||
|
|
@@ -122,7 +125,7 @@ export class MetricsTracerFactory { | |
| */ | ||
| public getMeterProvider(readers: MetricReader[] = []): MeterProvider { | ||
| if (this._meterProvider === null) { | ||
| const resource = resourceFromAttributes({ | ||
| [Constants.MONITORED_RES_LABEL_KEY_PROJECT]: this._projectId, | ||
| [Constants.MONITORED_RES_LABEL_KEY_CLIENT_HASH]: this._clientHash, | ||
| [Constants.MONITORED_RES_LABEL_KEY_LOCATION]: this._location, | ||
|
|
@@ -454,14 +457,14 @@ export class MetricsTracerFactory { | |
|
|
||
| /** | ||
| * Gets the location (region) of the client, otherwise returns to the "global" region. | ||
| * Uses the GCP resource detector to detect the region from the environment. | ||
| * @returns The detected region string, or "global" if not found. | ||
| */ | ||
| private static async _detectClientLocation(): Promise<string> { | ||
| const defaultRegion = 'global'; | ||
| try { | ||
| const resource = await detectResources({ | ||
| detectors: [gcpDetector], | ||
| }); | ||
|
|
||
| await resource?.waitForAsyncAttributes?.(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,9 +21,8 @@ import { | |
| ResourceMetrics, | ||
| } from '@opentelemetry/sdk-metrics'; | ||
| import {Resource} from '@opentelemetry/resources'; | ||
| import * as path from 'path'; | ||
| import {MetricKind, MonitoredResource, ValueType} from './external-types'; | ||
| import { | ||
| SPANNER_METER_NAME, | ||
| CLIENT_METRICS_PREFIX, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,7 +64,7 @@ | |
| .onThirdCall() | ||
| .returns({add: addGfeConnectivityErrorCountStub}); | ||
|
|
||
| sandbox.stub(MeterProvider.prototype, 'getMeter').returns(meterStub as any); | ||
|
|
||
| // metrics provider and related objects | ||
| mockExporter = sandbox.createStubInstance(CloudMonitoringMetricsExporter); | ||
|
|
@@ -79,13 +79,11 @@ | |
| MetricsTracerFactory.enabled = true; | ||
| sandbox.resetHistory(); | ||
| await MetricsTracerFactory.resetInstance(); | ||
| const reader = new PeriodicExportingMetricReader({ | ||
| exporter: mockExporter, | ||
| exportIntervalMillis: 60000, | ||
| }); | ||
| MetricsTracerFactory.getInstance('project-id')!.getMeterProvider([reader]); | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
|
|
@@ -166,12 +164,12 @@ | |
| '1.1a2bc3d4.1.1.1.1', | ||
| ); | ||
|
|
||
| assert.strictEqual((factory as any)._currentOperationTracers.size, 1); | ||
|
|
||
| factory!.clearCurrentTracer('1.1a2bc3d4.1.1.1'); | ||
|
|
||
| assert.strictEqual((factory as any)._currentOperationTracers.size, 0); | ||
| assert.strictEqual((factory as any)._currentOperationLastUpdatedMs.size, 0); | ||
| }); | ||
|
|
||
| it('should correctly set default attributes', () => { | ||
|
|
@@ -199,7 +197,7 @@ | |
| describe('getInstanceAttributes', () => { | ||
| let factory: MetricsTracerFactory; | ||
| beforeEach(() => { | ||
| factory = new (MetricsTracerFactory as any)(); | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ import { | |
| } from '../../src/metrics/constants'; | ||
| import {Counter, Meter, Histogram} from '@opentelemetry/api'; | ||
| import {ExportResult, ExportResultCode} from '@opentelemetry/core'; | ||
| import {resourceFromAttributes} from '@opentelemetry/resources'; | ||
|
|
||
| const PROJECT_ID = 'test-project'; | ||
| const INSTANCE_ID = 'test-instance'; | ||
|
|
@@ -95,7 +95,7 @@ describe('Export', () => { | |
| beforeEach(() => { | ||
| exporter = new CloudMonitoringMetricsExporter({auth}, PROJECT_ID); | ||
| reader = new InMemoryMetricReader(); | ||
| const resource = resourceFromAttributes({ | ||
| ['project_id']: PROJECT_ID, | ||
| ['client_hash']: CLIENT_HASH, | ||
| ['location']: LOCATION, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ import { | |
| MeterProvider, | ||
| MetricReader, | ||
| } from '@opentelemetry/sdk-metrics'; | ||
| import {Resource, resourceFromAttributes} from '@opentelemetry/resources'; | ||
| import { | ||
| Attributes, | ||
| Counter, | ||
|
|
@@ -84,7 +84,7 @@ describe('transform', () => { | |
| sandbox.stub(MetricsTracerFactory, 'getInstance').returns(mockFactory); | ||
|
|
||
| reader = new InMemoryMetricReader(); | ||
| resource = resourceFromAttributes({ | ||
| ['project_id']: 'project_id', | ||
| ['client_hash']: 'test_hash', | ||
| ['location']: 'test_location', | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In OpenTelemetry JS SDK v2,
Viewis still a class andMeterProviderexpects an array ofViewinstances rather thanViewOptionsplain objects. Additionally,Aggregationis an abstract class, so plain objects cannot be assigned to it.Please import
ViewandAggregationto define the views and aggregations properly.