Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-telemetry/opentelemetry.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa5bc7c33878c6579b30659bbf8fe4f5ac3188c7
Choose a base ref
..
head repository: open-telemetry/opentelemetry.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03971dc492c9856723a7855346488e7ca7165030
Choose a head ref
13 changes: 8 additions & 5 deletions .htmltest.yml
Original file line number Diff line number Diff line change
@@ -55,11 +55,14 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
# Ignore Docsy-generated GitHub links for now, until
# https://github.com/google/docsy/issues/1432 is fixed
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
# Here's an approximate regex to avoid the "View page source" links. TODO: fix this in Docsy
- ^https?://github\.com/open-telemetry/opentelemetry.io/tree/
# FIXME: A patch until we can get Docsy to mark "View page source" links as excluded from link checking,
# Actually, it would be better to pin the version of the OTel spec.
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/logs/event-(api|sdk)\.md
# Ignore "View page source" links, except for spec pages, i.e., links starting with
# https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/[^e]
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/es
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/.*?/_index.md$
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/[^d]
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/[^s]
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/security
# FIXME: same issue as for the OTel spec mentioned above:
- ^https://github.com/open-telemetry/semantic-conventions/tree/main

2 changes: 1 addition & 1 deletion content/en/docs/demo/tests.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ cSpell:ignore: Tracetest
---

Currently, the repository includes E2E tests for both the frontend and backend
services. For the Frontend we are using [Cypress](https://www.cypress.io/)
services. For the Frontend we are using [Cypress](https://www.cypress.io/) to
execute the different flows in the web store. While the backend services use
[AVA](https://avajs.dev) as the main testing framework for integration tests and
[Tracetest](https://tracetest.io/) for trace-based tests.
23 changes: 23 additions & 0 deletions content/zh/docs/faas/lambda-manual-instrument.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
title: Lambda 手动插桩
weight: 11
description: 使用 OpenTelemetry 手动插桩 Lambda
default_lang_commit: 06837fe15457a584f6a9e09579be0f0400593d57
---

对于在 Lambda 自动插桩文档中未涵盖的语言,社区尚未提供独立的插桩器。

用户需要遵循其选定语言的通用插桩指导,并添加 Collector Lambda 层来提交数据。

### 添加 OTel Collector Lambda 层的 ARN

参见 [Collector Lambda 层指导](../lambda-collector/)将层添加到你的应用程序并配置
Collector。我们建议首先添加此层。

### 使用 OTel 插桩 Lambda

查看[语言插桩指导](/docs/languages/),了解如何手动插桩你的应用程序。

### 发布你的 Lambda

发布新的 Lambda 版本以部署新更改和插桩器。
Original file line number Diff line number Diff line change
@@ -38,4 +38,4 @@ createdAt: 2024-04-26
package:
registry: nuget
name: Purview.Telemetry.SourceGenerator
version: 2.0.0
version: 2.0.1
2 changes: 1 addition & 1 deletion scripts/double-check-refcache-400s.mjs
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ async function retry400sAndUpdateCache() {
}

process.stdout.write(`Checking: ${url} (was ${StatusCode})... `);
const status = await getUrlStatus(url);
const status = await getUrlStatus(url, true);
console.log(`${status}.`);

if (!isHttp2XX(status)) continue;
25 changes: 20 additions & 5 deletions scripts/get-url-status.mjs
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

import puppeteer from 'puppeteer';

const cratesIoURL = 'https://crates.io/crates/';
let verbose = false;

function log(...args) {
@@ -24,8 +25,20 @@ async function getUrlHeadless(url) {

if (!response) throw new Error('No response from server.');

const status = response.status();
log(` Headless fetch returned HTTP status code: ${status}`);
let status = response.status();
const title = await page.title();

// Handles special case of crates.io. For details, see:
// https://github.com/rust-lang/crates.io/issues/788
if (url.startsWith(cratesIoURL)) {
const crateName = url.split('/').pop();
// Crate found iff title is `${crateName} - crates.io: Rust Package Registry`
if (!title.startsWith(crateName)) status = 404;
}

log(
`Headless fetch returned HTTP status code: ${status}; page title: '${title}'`,
);

return status;
} catch (error) {
@@ -66,9 +79,11 @@ export function isHttp2XX(status) {
return status && status >= 200 && status < 300;
}

export async function getUrlStatus(url) {
export async function getUrlStatus(url, _verbose = false) {
verbose = _verbose;
let status = await getUrlHeadless(url);
if (!isHttp2XX(status)) {
// If headless fetch fails, try in browser for non-404 statuses
if (!isHttp2XX(status) && status !== 404) {
status = await getUrlInBrowser(url);
}
return status;
@@ -83,7 +98,7 @@ async function mainCLI() {
process.exit(1);
}

const status = await getUrlStatus(url);
const status = await getUrlStatus(url, verbose);
process.exit(isHttp2XX(status) ? 0 : 1);
}

44 changes: 44 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
@@ -10007,6 +10007,50 @@
"StatusCode": 206,
"LastSeen": "2025-02-01T07:12:04.503997-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/archetypes/": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:00.765175-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/archetypes/blog.md": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:10:58.811797-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/content-modules": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:01.039226-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs/status.md": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:42.468045-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/data/ecosystem": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:10:57.073038-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/data/ecosystem/adopters.yaml": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:10:58.803368-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/data/ecosystem/distributions.yaml": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:03.290407-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/data/ecosystem/vendors.yaml": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:04.640959-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/data/registry": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:10:58.178169-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/layouts/shortcodes/docs": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:10:59.64214-05:00"
},
"https://github.com/open-telemetry/opentelemetry.io/tree/main/templates/registry-entry.yml": {
"StatusCode": 206,
"LastSeen": "2025-02-02T12:11:00.926611-05:00"
},
"https://github.com/open-telemetry/otel-arrow": {
"StatusCode": 206,
"LastSeen": "2025-01-30T17:00:10.089894-05:00"