Merge branch 'main' into esm-support

Author: JamieDanielson

…ntelemetry-shim-opencensus/.eslintignore …l/packages/shim-opencensus/.eslintignoreexperimental/packages/opentelemetry-shim-opencensus/.eslintignore renamed to experimental/packages/shim-opencensus/.eslintignore experimental/packages/opentelemetry-shim-opencensus/.eslintignore renamed to experimental/packages/shim-opencensus/.eslintignore

@@ -10,6 +10,7 @@
     "prepublishOnly": "npm run compile",
     "compile": "tsc --build",
     "clean": "tsc --build --clean",
+    "tdd": "npm run test -- --extension ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
     "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
     "lint": "eslint . --ext .ts",
@@ -44,28 +45,30 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/core": "1.11.0",
-    "@opentelemetry/context-async-hooks": "1.11.0",
+    "@opentelemetry/core": "1.12.0",
+    "@opentelemetry/context-async-hooks": "1.12.0",
     "@opencensus/core": "0.1.0",
-    "@opentelemetry/api": ">=1.0.0 <1.5.0",
+    "@opentelemetry/api": "1.4.1",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "codecov": "3.8.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
+    "sinon": "15.0.0",
+    "@types/sinon": "10.0.13",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },
   "peerDependencies": {
     "@opencensus/core": "^0.1.0",
-    "@opentelemetry/api": ">=1.0.0 <1.5.0"
+    "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/context-async-hooks": "^1.0.0",
     "semver": "^7.3.5",
     "require-in-the-middle": "^6.0.0"
   },
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opencensus",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus",
   "sideEffects": false
-}
+}

…entelemetry-shim-opencensus/.eslintrc.js …al/packages/shim-opencensus/.eslintrc.jsexperimental/packages/opentelemetry-shim-opencensus/.eslintrc.js renamed to experimental/packages/shim-opencensus/.eslintrc.js experimental/packages/opentelemetry-shim-opencensus/.eslintrc.js renamed to experimental/packages/shim-opencensus/.eslintrc.js

@@ -0,0 +1,78 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as oc from '@opencensus/core';
+
+import {
+  context,
+  propagation,
+  trace,
+  TextMapGetter,
+  TextMapSetter,
+} from '@opentelemetry/api';
+import { mapSpanContext, reverseMapSpanContext } from './transform';
+
+class Getter implements TextMapGetter<void> {
+  constructor(private ocGetter: oc.HeaderGetter) {}
+  keys(): string[] {
+    return [];
+  }
+  get(carrier: void, key: string) {
+    return this.ocGetter.getHeader(key);
+  }
+}
+
+class Setter implements TextMapSetter<void> {
+  constructor(private ocSetter: oc.HeaderSetter) {}
+  set(carrier: void, key: string, value: string): void {
+    this.ocSetter.setHeader(key, value);
+  }
+}
+
+/**
+ * Bridges OpenTelemetry propagation API into OpenCensus. The global OTel propagator is called
+ * to implement the OpenCensus propagation API.
+ */
+export const shimPropagation: oc.Propagation = {
+  extract(getter: oc.HeaderGetter): oc.SpanContext | null {
+    const extracted = propagation.extract(
+      context.active(),
+      null,
+      new Getter(getter)
+    );
+
+    const otelSc = trace.getSpanContext(extracted);
+    return otelSc ? reverseMapSpanContext(otelSc) : null;
+  },
+
+  inject(setter: oc.HeaderSetter, spanContext: oc.SpanContext): void {
+    const ctx = trace.setSpanContext(
+      context.active(),
+      mapSpanContext(spanContext)
+    );
+    propagation.inject(ctx, null, new Setter(setter));
+  },
+
+  generate(): oc.SpanContext {
+    // Reading OpenCensus code, it looks like this should generate a new random span context.
+    // However, it doesn't appear to be used based on my testing. Options for implementing:
+    //
+    //   - Return the invalid span context
+    //   - Use the OTel ID generator, however this package should be an API-only bridge
+    //   - Copy implementation from OpenCensus noop-propagation.ts
+    throw new Error('shimPropagation.generate() is not yet implemented');
+  },
+};

…opentelemetry-shim-opencensus/.npmignore …ntal/packages/shim-opencensus/.npmignoreexperimental/packages/opentelemetry-shim-opencensus/.npmignore renamed to experimental/packages/shim-opencensus/.npmignore experimental/packages/opentelemetry-shim-opencensus/.npmignore renamed to experimental/packages/shim-opencensus/.npmignore

@@ -0,0 +1,105 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as oc from '@opencensus/core';
+import {
+  Attributes,
+  SpanContext,
+  SpanKind,
+  TimeInput,
+  diag,
+} from '@opentelemetry/api';
+import { TraceState } from '@opentelemetry/core';
+
+function exhaust(value: never) {
+  diag.warn('Could not handle enum value %s', value);
+}
+
+export function mapSpanKind(
+  kind: oc.SpanKind | undefined
+): SpanKind | undefined {
+  switch (kind) {
+    case undefined:
+      return undefined;
+    case oc.SpanKind.UNSPECIFIED:
+      return SpanKind.INTERNAL;
+    case oc.SpanKind.CLIENT:
+      return SpanKind.CLIENT;
+    case oc.SpanKind.SERVER:
+      return SpanKind.SERVER;
+    default:
+      exhaust(kind);
+      return undefined;
+  }
+}
+
+export function mapSpanContext({
+  spanId,
+  traceId,
+  options,
+  traceState,
+}: oc.SpanContext): SpanContext {
+  return {
+    spanId,
+    traceId,
+    traceFlags: options ?? 0,
+    traceState:
+      traceState === undefined ? undefined : new TraceState(traceState),
+  };
+}
+
+export function reverseMapSpanContext({
+  spanId,
+  traceId,
+  traceFlags,
+  traceState,
+}: SpanContext): oc.SpanContext {
+  return {
+    spanId: spanId,
+    traceId: traceId,
+    options: traceFlags,
+    traceState: traceState?.serialize(),
+  };
+}
+
+// Copied from Java
+// https://github.com/open-telemetry/opentelemetry-java/blob/0d3a04669e51b33ea47b29399a7af00012d25ccb/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java#L24-L27
+const MESSAGE_EVENT_ATTRIBUTE_KEY_TYPE = 'message.event.type';
+const MESSAGE_EVENT_ATTRIBUTE_KEY_SIZE_UNCOMPRESSED =
+  'message.event.size.uncompressed';
+const MESSAGE_EVENT_ATTRIBUTE_KEY_SIZE_COMPRESSED =
+  'message.event.size.compressed';
+
+export function mapMessageEvent(
+  type: oc.MessageEventType,
+  id: number,
+  timestamp?: number,
+  uncompressedSize?: number,
+  compressedSize?: number
+): [string, Attributes, TimeInput | undefined] {
+  const attributes: Attributes = {
+    [MESSAGE_EVENT_ATTRIBUTE_KEY_TYPE]: oc.MessageEventType[type],
+  };
+  if (uncompressedSize !== undefined) {
+    attributes[MESSAGE_EVENT_ATTRIBUTE_KEY_SIZE_UNCOMPRESSED] =
+      uncompressedSize;
+  }
+  if (compressedSize !== undefined) {
+    attributes[MESSAGE_EVENT_ATTRIBUTE_KEY_SIZE_COMPRESSED] = compressedSize;
+  }
+
+  return [id.toString(), attributes, timestamp];
+}