Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation #4420

Merged
merged 8 commits into from
Jan 31, 2024
Merged

refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation #4420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ced1aa
refactor(instrumentation-grpc): clean up remnants of 'grpc' package i…
pichlermarc Jan 16, 2024
77a5113
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 16, 2024
dedfc3a
fix(changelog): add changelog entry
pichlermarc Jan 16, 2024
e9e8885
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 17, 2024
b12feec
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 25, 2024
57c4ea5
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 26, 2024
efade4e
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 31, 2024
4aec62e
Merge branch 'main' into refactor/instrumentation-grpc
pichlermarc Jan 31, 2024
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
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ All notable changes to experimental packages in this project will be documented

### :house: (Internal)

* refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation [#4420](https://github.com/open-telemetry/opentelemetry-js/pull/4420) @pichlermarc

## 0.48.0

### :boom: Breaking Change
Expand Down
17 changes: 10 additions & 7 deletions ...mentation-grpc/src/grpc-js/clientUtils.ts → ...y-instrumentation-grpc/src/clientUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,30 @@ import type { EventEmitter } from 'events';
import type { Span, SpanStatus } from '@opentelemetry/api';
import type { Client, Metadata, ServiceError } from '@grpc/grpc-js';
import type * as grpcJs from '@grpc/grpc-js';
import type { GrpcJsInstrumentation } from './';
import type { GrpcClientFunc, SendUnaryDataCallback } from './types';
import type { metadataCaptureType } from '../internal-types';
import type { GrpcInstrumentation } from './';
import type {
GrpcClientFunc,
SendUnaryDataCallback,
metadataCaptureType,
} from './internal-types';

import { propagation, context } from '@opentelemetry/api';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
import { AttributeNames } from '../enums/AttributeNames';
import { GRPC_STATUS_CODE_OK } from '../status-code';
import { AttributeNames } from './enums/AttributeNames';
import { GRPC_STATUS_CODE_OK } from './status-code';
import {
_grpcStatusCodeToSpanStatus,
_grpcStatusCodeToOpenTelemetryStatusCode,
_methodIsIgnored,
} from '../utils';
} from './utils';
import { errorMonitor } from 'events';

/**
* Parse a package method list and return a list of methods to patch
* with both possible casings e.g. "TestMethod" & "testMethod"
*/
export function getMethodsToWrap(
this: GrpcJsInstrumentation,
this: GrpcInstrumentation,
client: typeof Client,
methods: { [key: string]: { originalName?: string } }
): string[] {
Expand Down
Loading